|
|
@@ -310,7 +310,8 @@ 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,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')
|
|
|
@@ -322,7 +323,8 @@ 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,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')
|
|
|
@@ -351,31 +353,31 @@ class BaseExport extends Component {
|
|
|
'MOBILE' => "\t{$columnData['MOBILE']}",
|
|
|
'COUNTRY' => $columnData['COUNTRY'],
|
|
|
'CURRENCY' => $columnData['CURRENCY'],
|
|
|
-// 'PROVINCE' => $regionConfig[$columnData['PROVINCE']]['REGION_NAME'] ?? '',
|
|
|
-// 'CITY' => $regionConfig[$columnData['CITY']]['REGION_NAME'] ?? '',
|
|
|
-// 'COUNTY' => $regionConfig[$columnData['COUNTY']]['REGION_NAME'] ?? '',
|
|
|
-// 'ADDRESS' => $columnData['ADDRESS'],
|
|
|
-// 'PERIOD_NUM' => $columnData['PERIOD_NUM'],
|
|
|
-// 'ORDER_TYPE' => ($columnData['ORDER_TYPE'] == 'ZC') ? 'Welcome pack' : (in_array($columnData['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points'),
|
|
|
-// // 'WAREHOUSE' => $columnData['WAREHOUSE'],
|
|
|
-// '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']) : '',
|
|
|
-// 'BUY_NUMS' => $columnData['BUY_NUMS'],
|
|
|
-// 'REAL_PRICE' => $columnData['REAL_PRICE'],
|
|
|
-// 'TOTAL_PRICE' => $columnData['REAL_PRICE'] * $columnData['BUY_NUMS'],
|
|
|
-// 'REAL_PV' => $columnData['REAL_PV'] * $columnData['BUY_NUMS'],
|
|
|
-// 'STANDARD_PRICE' => $columnData['STANDARD_PRICE'] * $columnData['BUY_NUMS'],
|
|
|
-// '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_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'] ?? '',
|
|
|
-// 'AUTO_MAINTENANCE' => $columnData['AUTO_MAINTENANCE'] == 1 ? 'Yes' : 'No',
|
|
|
+ 'PROVINCE' => $regionConfig[$columnData['PROVINCE']]['REGION_NAME'] ?? '',
|
|
|
+ 'CITY' => $regionConfig[$columnData['CITY']]['REGION_NAME'] ?? '',
|
|
|
+ 'COUNTY' => $regionConfig[$columnData['COUNTY']]['REGION_NAME'] ?? '',
|
|
|
+ 'ADDRESS' => $columnData['ADDRESS'],
|
|
|
+ 'PERIOD_NUM' => $columnData['PERIOD_NUM'],
|
|
|
+ 'ORDER_TYPE' => ($columnData['ORDER_TYPE'] == 'ZC') ? 'Welcome pack' : (in_array($columnData['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points'),
|
|
|
+ // 'WAREHOUSE' => $columnData['WAREHOUSE'],
|
|
|
+ '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']) : '',
|
|
|
+ 'BUY_NUMS' => $columnData['BUY_NUMS'],
|
|
|
+ 'REAL_PRICE' => $columnData['REAL_PRICE'],
|
|
|
+ 'TOTAL_PRICE' => $columnData['REAL_PRICE'] * $columnData['BUY_NUMS'],
|
|
|
+ 'REAL_PV' => $columnData['REAL_PV'] * $columnData['BUY_NUMS'],
|
|
|
+ 'STANDARD_PRICE' => $columnData['STANDARD_PRICE'] * $columnData['BUY_NUMS'],
|
|
|
+ '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_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'] ?? '',
|
|
|
+ 'AUTO_MAINTENANCE' => $columnData['AUTO_MAINTENANCE'] == 1 ? 'Yes' : 'No',
|
|
|
];
|
|
|
|
|
|
fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));
|