Merge branch 'bugfix/order-standard-price' of http://16.162.42.175:8014/guanli/ngds into bugfix/order-standard-price

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -33,7 +33,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         $orderQuery = Order::find()
             ->alias('O')
             ->where($this->condition, $this->params)
-            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -45,7 +45,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         $orderStandardQuery = ApproachOrder::find()
             ->alias('O')
             ->where($this->condition . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $this->params)
-            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -180,7 +180,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                             case 'ZC':
                                 return 'Welcome pack';
                             case 'FX':
-                                return in_array($row['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Reselling': 'Points'; //'重消' : '积分'
+                                return in_array($row['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points'; //'重消' : '积分'
                         }
                     },
                 ],
@@ -233,7 +233,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'REAL_PV' => [
-                    'header' => 'Commodity Amount', // 商品金额
+                    'header' => 'BV Amount', // 商品金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -246,6 +246,20 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
+                'STANDARD_PRICE' => [
+                    'header' => 'Standard Amount', // 商品金额
+                    'headerOther' => [
+                        'width' => '150',
+                    ],
+                    'value' => function ($row) {
+                        return Tool::formatPrice($row['STANDARD_PRICE']);
+                    },
+                    'valueOther' => function ($row) {
+                        return [
+                            'tag' => ['type' => 'danger', 'size' => 'small', 'class' => 'no-border']
+                        ];
+                    },
+                ],
                 'PAY_FREIGHT' => [
                     'header' => 'Freight', // 运费
                     'headerOther' => [

common/models/ApproachOrder.php

@@ -50,6 +50,9 @@ use Yii;
  * @property string $NOTE 备注说明
  * @property string $LGA_NAME LGA_NAME
  * @property string $CITY_NAME 城市
+ * @property string $PAY_AMOUNT_STANDARD 支付价格
+ * @property string $ORDER_AMOUNT_STANDARD 订单总价格($)
+ * @property string $EXCHANGE_RATE 汇率
  */
 class ApproachOrder extends \common\components\ActiveRecord
 {

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/ApproachDeclarationUpgradeForm.php

@@ -59,6 +59,8 @@ class ApproachDeclarationUpgradeForm extends Model
     private $_decAmount;
     private $_decPv;
     private $_orderGoods;
+    private $_standardAmount;
+    private $_decAmountStandard;
     
     const TYPE_ZC = 'ZC';
     private $_userForm = null;
@@ -151,12 +153,16 @@ class ApproachDeclarationUpgradeForm 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'],
@@ -169,6 +175,9 @@ class ApproachDeclarationUpgradeForm extends Model
                                 'SKU_CODE' => $goods['GOODS_NO'],
                                 'GOODS_TITLE' => $goods['GOODS_NAME'],
                                 'EMAIL' => Info::getUserEmailByUserId(\Yii::$app->user->id) ?? '',
+                                'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                                'REAL_STANDARD_PRICE' => $realPriceStandard,
+                                'EXCHANGE_RATE' => $exchangeRate,
                                 'TAX_RATE' => $goods['TAX_RATE'],
                             ];
                         }
@@ -189,6 +198,8 @@ class ApproachDeclarationUpgradeForm extends Model
                 }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;
+                $this->_decAmountStandard = $totalAmountStandard;
+                $this->_standardAmount = $this->_decAmountStandard;
             }
 
             $baseInfo = Info::baseInfoZhByUserName($this->insertUserName);
@@ -252,6 +263,7 @@ class ApproachDeclarationUpgradeForm extends Model
                 throw new Exception(Form::formatErrorsForApi($decOrderModel->getErrors()));
             }
 
+            $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
             $orderModel = new ApproachOrder();
             $orderModel->SN = 'OS' . $ord;
             $orderModel->DEC_SN = 'DS' . $ord;
@@ -279,6 +291,9 @@ class ApproachDeclarationUpgradeForm extends Model
             $orderModel->CREATED_AT = Date::nowTime();
             $orderModel->CREATE_USER = Info::getUserNameByUserId(\Yii::$app->user->id);
             $orderModel->EMAIL = Info::getUserEmailByUserId(\Yii::$app->user->id) ?? '';
+            $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
+            $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
+            $orderModel->EXCHANGE_RATE = $exchangeRate;
             if(!$orderModel->save()){
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));

common/models/forms/ApproachOrderForm.php

@@ -63,6 +63,8 @@ class ApproachOrderForm extends Model
     private $_freight;
     private $_payAmount;
     private $_orderGoods;
+    private $_standardAmount;
+    private $_decAmountStandard;
 
     /**
      * @var ApproachOrder
@@ -374,7 +376,9 @@ class ApproachOrderForm extends Model
         $ids = $this->goodsId;
         $totalAmount = 0;
         $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]]);
@@ -383,13 +387,16 @@ class ApproachOrderForm extends Model
                         $discount = $goodsType[$goods['TYPE']]['discount'];
                         $realPrice = $goods['SELL_PRICE'] * $discount/100;
                         $realPv = $goods['PRICE_PV'] * $discount/100;
+                        $realPriceStandard = $goods['SELL_PRICE_STANDARD'] * $discount/100;
                     } else {
                         $discount = $goods['SELL_DISCOUNT'];
                         $realPrice = $goods['SELL_PRICE'] * $discount;
                         $realPv = $goods['PRICE_PV'] * $discount;
+                        $realPriceStandard = $goods['SELL_PRICE_STANDARD'] * $discount;
                     }
                     $totalAmount += $realPrice * intval($v);
                     $totalPv += $realPv * intval($v);
+                    $totalAmountStandard += $realPriceStandard * intval($v);
 
                     $this->_orderGoods[] = [
                         'GOODS_ID' => $goods['ID'],
@@ -405,6 +412,9 @@ class ApproachOrderForm extends Model
                         'CATEGORY_TYPE' => $goods['CATEGORY_TYPE'],
                         'PAY_TYPE' => $this->payType,
                         'EMAIL' => $this->email,
+                        'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                        'REAL_STANDARD_PRICE' => $realPriceStandard,
+                        'EXCHANGE_RATE' => $exchangeRate,
                     ];
                 }
             }
@@ -424,6 +434,8 @@ class ApproachOrderForm extends Model
             $this->_freight = 0;
         }
         $this->_payAmount = $this->_decAmount + $this->_freight;
+        $this->_decAmountStandard = $totalAmountStandard;
+        $this->_standardAmount = $this->_decAmountStandard + $this->_freight;
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
@@ -459,6 +471,7 @@ class ApproachOrderForm extends Model
         $userRealName = Info::getUserRealNameByUserId($userId);
         $userMobile = Info::getUserMobileByUserId($userId);
         $userEmail = Info::getUserEmailByUserId($userId);
+        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
         // 加入订单信息
         if ($this->_address['PROVINCE'] != 1) {
             $warehouse = Region::getWarehouseByCode($this->_address['PROVINCE']);//仓库
@@ -501,6 +514,9 @@ class ApproachOrderForm extends Model
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->CREATE_USER = $userName;
         $orderModel->EMAIL = $userEmail?$userEmail:$userName.'@elken.net';
+        $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
+        $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
+        $orderModel->EXCHANGE_RATE = $exchangeRate;
         if($this->_address['PROVINCE']==1){
             $orderModel->EXPRESS_TYPE = 1;
             $orderModel->CONSIGNEE = $userRealName;

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'],
@@ -677,6 +683,9 @@ class DeclarationForm extends Model
                                 'GOODS_TITLE' => $goods['GOODS_NAME'],
                                 'EMAIL' => $this->email,
                                 'TAX_RATE' => $goods['TAX_RATE'],
+                                'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                                'REAL_STANDARD_PRICE' => $realPriceStandard,
+                                'EXCHANGE_RATE' => $exchangeRate,
                             ];
                             // 更改库存和状态
                             $data = ShopGoods::find()->where(['ID' => $goods['ID']])->one();
@@ -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;
         }

common/models/forms/DeclarationUpgradeForm.php

@@ -55,6 +55,8 @@ class DeclarationUpgradeForm extends Model
     private $_decAmount;
     private $_decPv;
     private $_orderGoods;
+    private $_standardAmount;
+    private $_decAmountStandard;
     
     const TYPE_ZC = 'ZC';
     private $_userForm = null;
@@ -149,12 +151,16 @@ class DeclarationUpgradeForm 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'],
@@ -167,6 +173,9 @@ class DeclarationUpgradeForm extends Model
                                 'SKU_CODE' => $goods['GOODS_NO'],
                                 'GOODS_TITLE' => $goods['GOODS_NAME'],
                                 'EMAIL' => Info::getUserEmailByUserId(\Yii::$app->user->id) ?? '',
+                                'STANDARD_PRICE' => $goods['SELL_PRICE_STANDARD'],
+                                'REAL_STANDARD_PRICE' => $realPriceStandard,
+                                'EXCHANGE_RATE' => $exchangeRate,
                                 'TAX_RATE' => $goods['TAX_RATE'],
                             ];
                         }
@@ -187,6 +196,8 @@ class DeclarationUpgradeForm extends Model
                 }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;
+                $this->_decAmountStandard = $totalAmountStandard;
+                $this->_standardAmount = $this->_decAmountStandard;
             }
             //看现金余额是否充足
             if (Cash::getAvailableBalance($loginUserId) < $this->_decAmount){
@@ -249,6 +260,7 @@ class DeclarationUpgradeForm extends Model
                 throw new Exception(Form::formatErrorsForApi($decOrderModel->getErrors()));
             }
 
+            $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
             $orderModel = new Order();
             $orderModel->SN = 'OS'.$ord;
             $orderModel->DEC_SN = 'DS'.$ord;
@@ -277,6 +289,9 @@ class DeclarationUpgradeForm 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(!$orderModel->save()){
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));