保单bugfix

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

@@ -37,7 +37,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,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, DO.DEC_ID AS ORDER_DEC_ID')
+            ->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,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, O.DEC_USER_ID AS ORDER_DEC_ID')
             ->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')
@@ -52,7 +52,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,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, DO.DEC_ID AS ORDER_DEC_ID')
+            ->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,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, O.DEC_USER_ID AS ORDER_DEC_ID')
             ->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')
@@ -87,7 +87,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['DEC_ID']);
                 }
             } else {
-                $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['ORDER_DEC_ID']);
+//                $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['ORDER_DEC_ID']);
+                $this->listData['list'][$key]['DEC_USER_NAME'] = $value['ORDER_DEC_ID'];
             }
 
             $CREATE_USER_ID = Info::getUserIdByUserName($value['CREATE_USER']);

common/models/forms/ApproachDeclarationForm.php

@@ -894,7 +894,7 @@ class ApproachDeclarationForm extends Model
         $orderModel->EXCHANGE_RATE = $userCurrencyRate;
         $orderModel->COUNTRY_ID = $userCountryId;
         $orderModel->CURRENCY_ID = $userCountry['LOCAL_CURRENCY_ID'] ?? 0;
-        $orderModel->DEC_USER_ID = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->DEC_USER_ID = Info::getUserNameByUserId($this->_decId);
         if ($this->province==1) {
             $orderModel->EXPRESS_TYPE = 1;
         }

common/models/forms/DeclarationForm.php

@@ -942,7 +942,7 @@ class DeclarationForm extends Model
         $orderModel->EXCHANGE_RATE = $userCurrencyRate;
         $orderModel->COUNTRY_ID = $userCountryId;
         $orderModel->CURRENCY_ID = $userCountry['LOCAL_CURRENCY_ID'] ?? 0;
-        $orderModel->DEC_USER_ID = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->DEC_USER_ID = Info::getUserNameByUserId($this->_decId);
         if($this->province==1){
             $orderModel->EXPRESS_TYPE = 1;
         }