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

feat: EK-3320: 订单增加 Invoice 下载

zhangl 1 месяц назад
Родитель
Сommit
32eaa091fe
2 измененных файлов с 12 добавлено и 4 удалено
  1. 1 1
      backendApi/config/urlManagerRules.php
  2. 11 3
      common/libs/export/BaseExport.php

+ 1 - 1
backendApi/config/urlManagerRules.php

@@ -70,7 +70,7 @@ return [
             'GET order-standard-list' => 'order-standard-list',
             'POST import-order-standard-to-excel-table' => 'import-order-standard-to-excel-table',
             'POST import-order-standard' => 'import-order-standard',
-            'GET order-list-export-pdf/<orderSn>' => 'order-invoice-export',
+            'GET order-list-export-pdf/<orderSn>' => 'order-list-export-pdf',
             'GET dec-order-list-export-pdf/<orderSn>' => 'dec-order-list-export-pdf',
             'GET remain-pv' => 'remain-pv',
             'GET flow-remain-pv' => 'flow-remain-pv',

+ 11 - 3
common/libs/export/BaseExport.php

@@ -1555,7 +1555,7 @@ ORDER;
         $this->_listModel->isExport = true;
 
         // 查询订单数据
-        $oderList = OrderGoods::find()
+        $query = OrderGoods::find()
             ->alias('OG')
             ->where($this->params['condition'], $this->params['params'])
             ->select('OG.ID AS AID,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')
@@ -1563,8 +1563,16 @@ ORDER;
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
             ->orderBy('O.CREATED_AT DESC')
-            ->asArray()
-            ->all();
+            ->asArray();
+
+        $oderList = $query->all();
+
+        LoggerTool::debug([
+            'sql' => $query->createCommand()->getRawSql(),
+            'condition' => $this->params['condition'],
+            'params' => $this->params
+        ]);
+
 
         if ($oderList) {
             $userId = '';