Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@
 namespace backendApi\modules\v1\models\lists\shop;
 
 use common\helpers\Cache;
+use common\helpers\LoggerTool;
 use common\helpers\Tool;
 use common\helpers\user\Info;
 use common\libs\dataList\DataListInterface;
@@ -9,6 +10,7 @@ use common\models\ApproachOrder;
 use common\models\ApproachOrderGoods;
 use common\models\Countries;
 use common\models\Currency;
+use common\models\DecOrder;
 use common\models\Order;
 use common\models\OrderGoods;
 use common\models\ShopGoods;
@@ -35,12 +37,13 @@ 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')
+            ->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')
             ->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')
             ->join('LEFT JOIN', Countries::tableName() . ' AS CS', 'CS.ID=O.COUNTRY_ID')
             ->join('LEFT JOIN', Currency::tableName() . ' AS CY', 'CY.ID=O.CURRENCY_ID')
+            ->join('LEFT JOIN', DecOrder::tableName() . ' AS DO', 'DO.ORDER_SN=O.SN')
             ->orderBy('O.CREATED_AT DESC');
 
         // 订单中间表只查询待支付和支付失败的订单
@@ -49,12 +52,13 @@ 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')
+            ->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')
             ->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')
             ->join('LEFT JOIN', Countries::tableName() . ' AS CS', 'CS.ID=O.COUNTRY_ID')
             ->join('LEFT JOIN', Currency::tableName() . ' AS CY', 'CY.ID=O.CURRENCY_ID')
+            ->join('LEFT JOIN', DecOrder::tableName() . ' AS DO', 'DO.ORDER_SN=O.SN')
             ->orderBy('O.CREATED_AT DESC');
 
         $queryAll = $orderQuery->union($orderStandardQuery, true);
@@ -74,8 +78,19 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         ];
 
         foreach ($this->listData['list'] as $key => $value) {
+            if ($value['ORDER_TYPE'] == 'FX') {
+                if ($value['DEC_USER_ID']) {
+                    // 复消：显示传入的报单中心
+                    $this->listData['list'][$key]['DEC_USER_NAME'] = $value['DEC_USER_ID'];
+                } else {
+                    // 会员复消：订单会员的所属报单中心
+                    $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']);
+            }
+
             $CREATE_USER_ID = Info::getUserIdByUserName($value['CREATE_USER']);
-            $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['DEC_ID']);
             $this->listData['list'][$key]['CREATE_USER_NAME'] = Info::getUserRealNameByUserId($CREATE_USER_ID);
         }
     }

common/messages/en-US/ctx.php

@@ -69,14 +69,14 @@ return [
     'modelListFinanceWithdrawFees' => 'Bank charge',
     'modelListFinanceWithdrawRealAmount' => 'Actual amount',
     'modelListFinanceWithdrawBank' => 'Bank info',
-    'modelListFinanceWithdrawBankNo' => 'Bank account',
+    'modelListFinanceWithdrawBankNo' => 'Payment Reference',
     'modelListFinanceWithdrawMobile' => 'Phone Number',
     'modelListFinanceWithdrawUpdateAdminName' => 'Operations administrator',
     'modelListFinanceWithdrawBackRemark' => 'Return note',
     'modelListFinanceWithdrawWithdrawalTime'=>'Withdrawal time',
     'modelsListsFinanceRechargeListgetColumnSn' => 'SN',
     'modelsListsFinanceRechargeListgetColumnBank' => 'Bank',
-    'modelsListsFinanceRechargeListgetColumnBankNo' => 'Bank account',
+    'modelsListsFinanceRechargeListgetColumnBankNo' => 'Payment Reference',
     'modelsListsFinanceRechargeListgetColumnAuditStatus' => 'Audit Status',
     'modelsListsFinanceRechargeListgetColumnAmount' => 'Recharge amount',
     'modelsListsFinanceRechargeListgetColumnCreatedAt' => 'Apply time',

common/models/forms/AdminAddUserForm.php

@@ -111,7 +111,7 @@ class AdminAddUserForm extends Model {
             'address' => 'Address',//地址
             'openBank' => 'Bank Name',//开户行
             'bankAddress' => 'Account opening sub branch',//开户支行
-            'bankNo' => 'bank account',//银行账号
+            'bankNo' => 'Payment Reference',//银行账号
             'bankAreaSelected' => 'Banking region',//银行地区
             'decLv' => 'Real time declaration level',//实时报单级别
             'areaSelected' => 'Location',//所在地区

common/models/forms/RechargeForm.php

@@ -81,7 +81,7 @@ class RechargeForm extends Model {
             'userName' => 'Member code',// 会员编号
             'applyAmount' => 'Apply Amount', // 申请充值的金额
             'openBank' => 'Bank name',// 汇款银行
-            'bankNo' => 'Bank account', // 汇款账号
+            'bankNo' => 'Payment Reference', // 汇款账号
 //            'bankAddress' => '银行支行',
 //            'bankProvince' => '银行省',
 //            'bankCity' => '银行市',