管理后台订单修改

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

@@ -7,6 +7,8 @@ use common\helpers\user\Info;
 use common\libs\dataList\DataListInterface;
 use common\models\ApproachOrder;
 use common\models\ApproachOrderGoods;
+use common\models\Countries;
+use common\models\Currency;
 use common\models\Order;
 use common\models\OrderGoods;
 use common\models\ShopGoods;
@@ -33,10 +35,12 @@ 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')
+            ->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.NAME AS CURRENCY')
             ->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')
             ->orderBy('O.CREATED_AT DESC');
 
         // 订单中间表只查询待支付和支付失败的订单
@@ -45,10 +49,12 @@ 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')
+            ->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.NAME AS CURRENCY')
             ->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')
             ->orderBy('O.CREATED_AT DESC');
 
         $queryAll = $orderQuery->union($orderStandardQuery, true);
@@ -71,7 +77,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
             $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);
-//            $this->listData['list'][$key]['GOODS_NO'] = '';
         }
     }
 
@@ -139,6 +144,12 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 'TEL' => [
                     'header' => \Yii::t('ctx', 'shopOrderListContactTwo'), // 联系方式2
                 ],
+                'COUNTRY' => [
+                    'header' => \Yii::t('ctx', 'country'), // 国家
+                ],
+                'CURRENCY' => [
+                    'header' => \Yii::t('ctx', 'currency'), // 币种
+                ],
                 'PROVINCE' => [
                     'header' => \Yii::t('ctx', 'shopOrderListState'), // 州
                     'headerOther' => ['width' => '120'],

common/messages/en-US/ctx.php

@@ -544,6 +544,7 @@ return [
     'levelBeforeModification' => 'Level Before Modification',
     'modifiedLevel' => 'Modified Level',
     'country' => 'Country',
+    'currency' => '货币',
     'beforeCountry' => '修改前国家',
     'afterCountry' => '修改前国家',
 

common/messages/zh-CN/ctx.php

@@ -544,6 +544,7 @@ return [
     'isStudio' => '是否是工作室',
     'email' => '电子邮箱',
     'country' => '国家',
+    'currency' => '货币',
 
     'moveMember' => '移动的会员',
     'moveMemberName' => '移动的会员名字',