feature/20251216-orderlistexport

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;
@@ -307,15 +309,16 @@ class BaseExport extends Component {
      */
     private function _loopWriteDataOrder()
     {
-        LoggerTool::debug(['ryan' => 1]);
         $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');
 
         // 订单中间表只查询待支付和支付失败的订单
@@ -324,18 +327,19 @@ 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();
 
-        LoggerTool::debug(['ryan' => 2]);
 
         if(!empty($lists)){
             $regionConfig = Cache::getRegionConfig();
@@ -383,7 +387,6 @@ class BaseExport extends Component {
                     'AUTO_MAINTENANCE' => $columnData['AUTO_MAINTENANCE'] == 1 ? 'Yes' : 'No',
                 ];
 
-                LoggerTool::debug(['ryan' => $columnAccept]);
                 fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));
                 unset($percent, $columnData, $columnAccept);
             }