Merge branch 'new-version' into bugfixed/dd-storebonus-parentuids

common/models/forms/DeclarationForm.php

@@ -626,6 +626,14 @@ class DeclarationForm extends Model
                     'SKU_CODE' => $decPackage['PACKAGE_NO'],
                     'GOODS_TITLE' => $decPackage['PACKAGE_NAME']
                 ];
+                // 更改库存和状态
+                $data = DeclarationPackage::find()->where(['ID' => $decPackage['ID']])->one();
+                $data->STORE_NUMS = $data->STORE_NUMS - 1;
+                if($data->STORE_NUMS <= 0){
+                    $data->STATUS = 0;
+                    $data->UPDATED_AT = Date::nowTime();
+                }
+                $data->update();
             }else{
                 $ids = $this->goodsId;
                 $totalAmount = 0;
@@ -647,6 +655,14 @@ class DeclarationForm extends Model
                                 'SKU_CODE' => $goods['GOODS_NO'],
                                 'GOODS_TITLE' => $goods['GOODS_NAME']
                             ];
+                            // 更改库存和状态
+                            $data = ShopGoods::find()->where(['ID' => $goods['ID']])->one();
+                            $data->STORE_NUMS = $data->STORE_NUMS - intval($v);
+                            if($data->STORE_NUMS <= 0){
+                                $data->STATUS = 0;
+                                $data->UPDATED_AT = Date::nowTime();
+                            }
+                            $data->update();
                         }
                     }
                 }

common/models/forms/DeclarationLoopForm.php

@@ -112,84 +112,36 @@ class DeclarationLoopForm extends Model
             $allZcUserIds = [];
             $zcUserIdCard = null;
             $model = new DeclarationForm();
-//            var_dump('$model');
-//            var_dump($model);
-//            var_dump('----------------------------$model--------------------------------');
             $model->scenario = $this->scenario;
-//            var_dump('$model-scenario');
-//            var_dump($model->scenario);
-//            var_dump('----------------------------$model->scenario----------------------');
+
             $model->allData = $this->data;
-//            var_dump('$model->allData');
-//            var_dump($model->allData);
-//            var_dump('----------------------------$model->allData-----------------------');
             foreach ($this->data as $value){
-//                var_dump('goodsId');
-//                var_dump($value['goodsId']);
-//                var_dump('goodsNum');
-
-
-
                 /**
                  * 2022-04-29
                  * York
                  * 获取商品套餐信息
                  */
                 if (isset($value['packageId']) && $value['packageId']){
-
-
                     $packagedata = DeclarationPackage::findOneAsArray('ID=:ID', [':ID' => $value['packageId']]);
                     //var_dump($packagedata['ID']);
-                    if($packagedata['STORE_NUMS']>0){
-                        $data =  DeclarationPackage::find()->where(['ID'=> $packagedata['ID'] ])->one();
-                        $goods_store_nums = $data->STORE_NUMS - 1;
-                        $data->STORE_NUMS = $goods_store_nums;
-                        $data->update();
-//                        var_dump('输出一下数量');
-//                        var_dump($goods_store_nums);
-                        //库存为0下架套餐
-                        if ($goods_store_nums <= 0){
-                            $data->STATUS = 0;
-                            $data->UPDATED_AT = Date::nowTime();
-//                            var_dump('购买后套餐库存为0 下架拉');
-                        }
-
-                    }else{
+                    if($packagedata['STORE_NUMS']<=0){
                         throw new Exception($packagedata['PACKAGE_NAME'].'库存不足');
                     }
-
-
                 }
 
                 if (count($value['goodsId']) > 0 && (count($value['goodsId']) == count($value['goodsNum']))){
                     for ($i=0;$i<count($value['goodsId']);$i++){
                         $goods = ShopGoods::findOneAsArray('ID=:ID',[':ID'=> $value['goodsId'][$i]]);
                         if ($goods['STATUS'] == 1 ){
-                            if($goods['STORE_NUMS'] >= $value['goodsNum'][$i]){
-                                $data = ShopGoods::find()->where(['ID' => $value['goodsId'][$i]])->one();
-                                $goods_store_nums = $data->STORE_NUMS - $value['goodsNum'][$i];
-                                $data->STORE_NUMS = $goods_store_nums;
-                                $data->update();
-                                if($goods_store_nums <= 0){
-                                    $data->STATUS = 0;
-                                    $data->UPDATED_AT = Date::nowTime();
-                                    $data->update();
-                                }
-                            }else{
+                            if($goods['STORE_NUMS'] < $value['goodsNum'][$i]){
                                 throw new Exception($goods['GOODS_NAME'].'商品库存不足');
                             }
-
                         }else{
                             throw new Exception($goods['GOODS_NAME'].'商品已下架');
                         }
-
                     }
-
                 }
 
-
-
-
                 if(is_array($value)){
                     foreach($value as $key=>$decFormData){
                         $model->$key = $decFormData;
@@ -208,31 +160,11 @@ class DeclarationLoopForm extends Model
                     if(!$model->add($this->data)){
                         throw new Exception(Form::formatErrorsForApi($model->getErrors()));
                     }
-
-
-
-
-
-//                    $model->type = null;
-//                    $model->decSn = null;
-//                    $model->userId = null;
-//                    $model->toUserId = null;
-//                    $model->decPv = null;
-//                    $model->insertUserName = null;
-//                    $model->insertUserIdCard = null;
-//                    $model->conUserName = null;
-//                    $model->recUserName = null;
-//                    $model->location = null;
                 } else {
                     throw new Exception('报单数据格式错误');
                 }
             }
 
-            // 把这几个首购单的注册用户点位绑定到一起
-//            UserBind::zcBind($allZcUserIds, $zcUserIdCard);
-//            if((microtime(true) - $startTime) >= 20)  {
-//                throw new Exception('服务端报单超时');
-//            }
             $transaction->commit();
         } catch (\Exception $e){
             $transaction->rollBack();

common/models/forms/DeclarationUpgradeForm.php

@@ -284,26 +284,23 @@ class DeclarationUpgradeForm extends Model
 
                     $storenums = $goods['STORE_NUMS'] - $this->goodsNum[$k];
                     if($goods['STATUS']==1){
-                       if($goods['STORE_NUMS'] >=$this->goodsNum[$k]){
-                           $data = ShopGoods::find()->where(['ID' => $this->goodsId[$k]])->one();
-                           $data->STORE_NUMS = $storenums;
-                           $data->update();
-                           if ($storenums==0){
-                               $data->STATUS = 0;
-                               $data->UPDATED_AT = Date::nowTime();
-                               $data->update();
-                           }
-                       }else{
-                           throw new Exception("商品".$goods['GOODS_NAME']."库存不足");
-                       }
+                        if($goods['STORE_NUMS'] >=$this->goodsNum[$k]){
+                            $data = ShopGoods::find()->where(['ID' => $this->goodsId[$k]])->one();
+                            $data->STORE_NUMS = $storenums;
+                            $data->update();
+                            if ($storenums==0){
+                                $data->STATUS = 0;
+                                $data->UPDATED_AT = Date::nowTime();
+                                $data->update();
+                            }
+                        }else{
+                            throw new Exception("商品".$goods['GOODS_NAME']."库存不足");
+                        }
                     }else{
                         throw new Exception("商品".$goods['GOODS_NAME']."已下架");
                     }
                 }
             }
-           // exit();
-
-
 
             // 加入商品到订单商品表
             foreach($this->_orderGoods as $key=>$value){
@@ -347,7 +344,6 @@ class DeclarationUpgradeForm extends Model
         } catch(Exception $e) {
             $transaction->rollBack();
             throw new Exception($e->getMessage());
-            
             return false;
         }
 

common/models/forms/OrderForm.php

@@ -292,18 +292,7 @@ class OrderForm extends Model
                     $realPv = $goods['PRICE_PV'] * $discount;
                     $totalAmount += $realPrice * intval($v);
                     $totalPv += $realPv * intval($v);
-//                    if($this->payType=='cash') {
-//                        $discount = $goodsType[$goods['TYPE']]['discount'];
-//                        $realPrice = $goods['SELL_PRICE'] * $discount/100;
-//                        $realPv = $goods['PRICE_PV'] * $discount/100;
-//                        $totalAmount += $realPrice * intval($v);
-//                        $totalPv += $realPv * intval($v);
-//                    }else{
-//                        $realPrice = $goods['SELL_PRICE'];
-//                        $realPv = $goods['PRICE_PV'];
-//                        $totalAmount += $realPrice * intval($v);
-//                        $totalPv += $realPv * intval($v);
-//                    }
+
                     $this->_orderGoods[] = [
                         'GOODS_ID' => $goods['ID'],
                         'PRICE' => $goods['SELL_PRICE'],