Просмотр исходного кода

feature/20251216-orderlistexport

ryan 2 недель назад
Родитель
Сommit
70d23bbfd3

+ 0 - 8
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'],

+ 2 - 0
common/libs/export/BaseExport.php

@@ -1255,7 +1255,9 @@ 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']),