Merge branch 'feature/20251216-orderlistexport' of guanli/ngds into master

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

@@ -340,14 +340,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
-//                'EXPRESS_COMPANY' => [
-//                    'header' => \Yii::t('ctx', 'shopOrderListCourierCompany'), // 快递公司
-//                    'headerOther' => ['width' => '190'],
-//                ],
-//                'ORDER_TRACK_NO' => [
-//                    'header' => \Yii::t('ctx', 'shopOrderListCourierNumber'), // 快递单号
-//                    'headerOther' => ['width' => '200'],
-//                ],
                 'EXPRESS_TYPE' => [
                     'header' => \Yii::t('ctx', 'shopOrderListShippingMethod'), // 发货方式
                     'headerOther' => ['width' => '150'],

common/libs/export/BaseExport.php

@@ -18,7 +18,9 @@ use common\models\BaApproachOrderGoods;
 use common\models\BaOrder;
 use common\models\BaOrderGoods;
 use common\models\BaUser;
+use common\models\Countries;
 use common\models\Currency;
+use common\models\DecOrder;
 use common\models\Export;
 use common\models\Order;
 use common\models\OrderGoods;
@@ -310,10 +312,13 @@ class BaseExport extends Component {
         $orderQuery = Order::find()
             ->alias('O')
             ->where($this->params['condition'], $this->params['params'])
-            ->select('O.*,U.REAL_NAME,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.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')
+            ->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');
 
         // 订单中间表只查询待支付和支付失败的订单
@@ -322,16 +327,20 @@ class BaseExport extends Component {
         $orderStandardQuery = ApproachOrder::find()
             ->alias('O')
             ->where($this->params['condition'] . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $this->params['params'])
-            ->select('O.*,U.REAL_NAME,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.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')
+            ->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);
         $query = (new Query())->from(['Q' => $queryAll])->select('Q.*')->distinct()->orderBy(['CREATED_AT' => SORT_DESC]);
         $lists = $query->all();
 
+
         if(!empty($lists)){
             $regionConfig = Cache::getRegionConfig();
             foreach($lists as $columnData) {
@@ -349,7 +358,8 @@ class BaseExport extends Component {
                     'GOODS_TITLE' => Tool::mbSignConvert($columnData['GOODS_TITLE']) ,
                     'CONSIGNEE' => $columnData['CONSIGNEE'],
                     'MOBILE' => "\t{$columnData['MOBILE']}",
-                    'TEL' => "\t{$columnData['TEL']}",
+                    'COUNTRY' => $columnData['COUNTRY'],
+                    'CURRENCY' => $columnData['CURRENCY'],
                     'PROVINCE' => $regionConfig[$columnData['PROVINCE']]['REGION_NAME'] ?? '',
                     'CITY' => $regionConfig[$columnData['CITY']]['REGION_NAME'] ?? '',
                     'COUNTY' => $regionConfig[$columnData['COUNTY']]['REGION_NAME'] ?? '',
@@ -360,7 +370,7 @@ class BaseExport extends Component {
                     'CREATED_AT' => Date('Y-m-d H:i:s', $columnData['CREATED_AT']),
                     'PAY_TYPE' => ShopGoods::payTypes()[$columnData['PAY_TYPE']]['name'] ?? ShopGoods::payTypes()['cash']['name'],
                     'PAY_AT' => $columnData['PAY_AT'] > 0 ? Date('Y-m-d H:i:s', $columnData['PAY_AT']) : '',
-                    'DELIVERY_AT' => $columnData['DELIVERY_AT'] > 0 ? Date('Y-m-d H:i:s', $columnData['DELIVERY_AT']) : '',
+//                    'DELIVERY_AT' => $columnData['DELIVERY_AT'] > 0 ? Date('Y-m-d H:i:s', $columnData['DELIVERY_AT']) : '',
                     'BUY_NUMS' => $columnData['BUY_NUMS'],
                     'REAL_PRICE' => $columnData['REAL_PRICE'],
                     'TOTAL_PRICE' => $columnData['REAL_PRICE'] * $columnData['BUY_NUMS'],
@@ -369,12 +379,12 @@ class BaseExport extends Component {
                     'PAY_FREIGHT' => $columnData['PAY_FREIGHT'],
                     'TAX_RATE' => $columnData['TAX_RATE'],
                     'TAX_AMOUNT' => Tool::calculateTax($columnData['REAL_PRICE'], $columnData['TAX_RATE'], $columnData['BUY_NUMS']),
-                    'EXPRESS_COMPANY' => $columnData['EXPRESS_COMPANY'],
-                    'ORDER_TRACK_NO' => $columnData['ORDER_TRACK_NO'],
+//                    'EXPRESS_COMPANY' => $columnData['EXPRESS_COMPANY'],
+//                    'ORDER_TRACK_NO' => $columnData['ORDER_TRACK_NO'],
                     'EXPRESS_TYPE' => $columnData['EXPRESS_TYPE'] == 0 ? 'mailing ':' auto pick',
                     'FRONT_REMARK' => $columnData['FRONT_REMARK'],
                     'DELIVERY_STATUS_NAME' => Tool::paramConvert(\Yii::$app->params['deliveryStatus'])[$columnData['DELIVERY_STATUS']]['label'] ?? '',
-                    'IS_AUTO' => $columnData['IS_AUTO'] == 1 ? 'Yes' : 'No',
+                    'AUTO_MAINTENANCE' => $columnData['AUTO_MAINTENANCE'] == 1 ? 'Yes' : 'No',
                 ];
 
                 fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));