标准价格字段bugfix

common/models/forms/ApproachDeclarationForm.php

@@ -75,6 +75,8 @@ class ApproachDeclarationForm extends Model
     private $_decAmount;
     private $_decPv;
     private $_orderGoods;
+    private $_standardAmount;
+    private $_decAmountStandard;
 
     // 批量报单时添加会员的REDIS里面缓存的添加的会员资料
     const REDIS_WAIT_ADD_USER = 'user:dec:waitAdd';
@@ -642,12 +644,16 @@ class ApproachDeclarationForm extends Model
                 } else {
                     $ids = $this->goodsId;
                     $totalAmount = 0;
+                    $totalAmountStandard = 0;
                     $totalPv = 0;
+                    $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
                     foreach ($this->goodsNum as $k => $v) {
                         if ($v) {
                             $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1', [':ID' => $ids[$k]]);
                             if ($goods['STORE_NUMS'] > 0) {
                                 $totalAmount += $goods['SELL_PRICE'] * intval($v);
+                                $totalAmountStandard += $goods['SELL_PRICE_STANDARD'] * intval($v);
+                                $realPriceStandard = $goods['SELL_PRICE_STANDARD'];
                                 $totalPv += $goods['PRICE_PV'] * intval($v);
                                 $this->_orderGoods[] = [
                                     'GOODS_ID' => $goods['ID'],
@@ -660,6 +666,9 @@ class ApproachDeclarationForm extends Model
                                     'SKU_CODE' => $goods['GOODS_NO'],
                                     'GOODS_TITLE' => $goods['GOODS_NAME'],
                                     'EMAIL' => $this->email,
+                                    'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                                    'REAL_STANDARD_PRICE' => $realPriceStandard,
+                                    'EXCHANGE_RATE' => $exchangeRate,
                                     'TAX_RATE' => $goods['TAX_RATE'],
                                 ];
                             }
@@ -678,6 +687,8 @@ class ApproachDeclarationForm extends Model
                     }
                     $this->_decAmount = $totalAmount;
                     $this->_decPv = $totalPv;
+                    $this->_decAmountStandard = $totalAmountStandard;
+                    $this->_standardAmount = $this->_decAmountStandard;
                 }
 
                 if (!($this->addUser($allData))) {
@@ -812,7 +823,7 @@ class ApproachDeclarationForm extends Model
         } else {
             $warehouse = '01';
         }
-
+        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
         $orderModel = new ApproachOrder();
         $orderModel->SN = 'OS' . $ord;
         $orderModel->DEC_SN = 'DS' . $ord;
@@ -840,6 +851,9 @@ class ApproachDeclarationForm extends Model
         $orderModel->STATUS = \Yii::$app->params['orderStatus']['notPaid']['value'];
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->CREATE_USER = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
+        $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
+        $orderModel->EXCHANGE_RATE = $exchangeRate;
         if ($this->province==1) {
             $orderModel->EXPRESS_TYPE = 1;
         }

common/models/forms/ApproachOrderForm.php

@@ -378,6 +378,7 @@ class ApproachOrderForm extends Model
         $totalPv = 0;
         $totalAmountStandard = 0;
         $goodsType = ShopGoods::GOODS_TYPE;
+        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
         foreach ($this->goodsNum as $k => $v) {
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
@@ -413,6 +414,7 @@ class ApproachOrderForm extends Model
                         'EMAIL' => $this->email,
                         'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
                         'REAL_STANDARD_PRICE' => $realPriceStandard,
+                        'EXCHANGE_RATE' => $exchangeRate,
                     ];
                 }
             }

common/models/forms/DeclarationForm.php

@@ -70,6 +70,8 @@ class DeclarationForm extends Model
     private $_decAmount;
     private $_decPv;
     private $_orderGoods;
+    private $_standardAmount;
+    private $_decAmountStandard;
 
     // 批量报单时添加会员的REDIS里面缓存的添加的会员资料
     const REDIS_WAIT_ADD_USER = 'user:dec:waitAdd';
@@ -658,12 +660,16 @@ class DeclarationForm extends Model
             }else{
                 $ids = $this->goodsId;
                 $totalAmount = 0;
+                $totalAmountStandard = 0;
                 $totalPv = 0;
+                $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
                 foreach ($this->goodsNum as $k => $v) {
                     if ($v) {
                         $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                         if($goods['STORE_NUMS']>0){
                             $totalAmount += $goods['SELL_PRICE'] * intval($v);
+                            $totalAmountStandard += $goods['SELL_PRICE_STANDARD'] * intval($v);
+                            $realPriceStandard = $goods['SELL_PRICE_STANDARD'];
                             $totalPv += $goods['PRICE_PV'] * intval($v);
                             $this->_orderGoods[] = [
                                 'GOODS_ID' => $goods['ID'],
@@ -676,6 +682,9 @@ class DeclarationForm extends Model
                                 'SKU_CODE' => $goods['GOODS_NO'],
                                 'GOODS_TITLE' => $goods['GOODS_NAME'],
                                 'EMAIL' => $this->email,
+                                'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                                'REAL_STANDARD_PRICE' => $realPriceStandard,
+                                'EXCHANGE_RATE' => $exchangeRate,
                                 'TAX_RATE' => $goods['TAX_RATE'],
                             ];
                             // 更改库存和状态
@@ -702,6 +711,8 @@ class DeclarationForm extends Model
                 }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;
+                $this->_decAmountStandard = $totalAmountStandard;
+                $this->_standardAmount = $this->_decAmountStandard;
             }
             //看现金余额是否充足
             $loginUserId = \Yii::$app->user->id;
@@ -833,6 +844,7 @@ class DeclarationForm extends Model
         }else{
             $warehouse = '01';
         }
+        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
         $orderModel = new Order();
         $orderModel->SN = 'OS'.$ord;
         $orderModel->DEC_SN = 'DS'.$ord;
@@ -862,6 +874,9 @@ class DeclarationForm extends Model
         $orderModel->STATUS = 1;
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->CREATE_USER = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
+        $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
+        $orderModel->EXCHANGE_RATE = $exchangeRate;
         if($this->province==1){
             $orderModel->EXPRESS_TYPE = 1;
         }