feature/20251216-orderlistexport

common/libs/export/BaseExport.php

@@ -349,7 +349,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 +361,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 +370,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 ? \Yii::t('ctx', 'yes') : \Yii::t('ctx', 'no'),
                 ];
 
                 fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));
@@ -1200,7 +1201,7 @@ ORDER;
         $orderQuery = BaOrder::find()
             ->alias('O')
             ->where($this->params['condition'], $this->params['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, O.DEC_USER_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')
             ->join('LEFT JOIN', BaUser::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', BaOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -1212,7 +1213,7 @@ ORDER;
         $orderStandardQuery = BaApproachOrder::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,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')
+            ->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')
             ->join('LEFT JOIN', BaUser::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', BaApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -1241,8 +1242,6 @@ ORDER;
                     'BUY_NUMS' => $columnData['BUY_NUMS'],
                     'CONSIGNEE' => $columnData['CONSIGNEE'],
                     'MOBILE' => "\t{$columnData['MOBILE']}",
-                    'COUNTRY' => $columnData['COUNTRY'],
-                    'CURRENCY' => $columnData['CURRENCY'],
                     'TEL' => "\t{$columnData['TEL']}",
                     'PROVINCE' => $regionConfig[$columnData['PROVINCE']]['REGION_NAME'] ?? '',
                     'CITY' => $regionConfig[$columnData['CITY']]['REGION_NAME'] ?? '',
@@ -1255,9 +1254,7 @@ ORDER;
                     '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']) : '',
                     'REAL_PRICE' => $columnData['REAL_PRICE'] ?? 0,
-                    'TOTAL_PRICE' => $columnData['TOTAL_PRICE'] ?? 0,
                     'REAL_PV' => $columnData['REAL_PV'] ?? 0,
-                    'STANDARD_PRICE' => $columnData['STANDARD_PRICE'] ?? 0,
                     'PAY_FREIGHT' => $columnData['PAY_FREIGHT'] ?? 0,
                     'TAX_RATE' => $columnData['TAX_RATE'],
                     'TAX_AMOUNT' => Tool::calculateTax($columnData['REAL_PRICE'], $columnData['TAX_RATE'], $columnData['BUY_NUMS']),
@@ -1268,7 +1265,7 @@ ORDER;
                     'DELIVERY_STATUS_NAME' => Tool::paramConvert(\Yii::$app->params['deliveryStatus'])[$columnData['DELIVERY_STATUS']]['label'] ?? '',
                 ];
 
-                fputcsv($this->_fp, Tool::arrTextConvert([]));
+                fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));
                 unset($percent, $columnData, $columnAccept);
             }
             unset($list);