feature/EK-33291的改动

common/libs/export/BaseExport.php

@@ -192,7 +192,7 @@ class BaseExport extends Component {
      */
     public function getParams() {
         $this->params = CacheHelper::getAsyncParams($this->taskId);
-        
+
         // 设置语言
         Yii::$app->language = $this->params['language'] ?? 'en-US';
         Yii::$app->sourceLanguage = Yii::$app->language == 'zh-CN' ? 'en-US' : 'zh-CN';
@@ -1263,7 +1263,7 @@ ORDER;
                     'FRONT_REMARK' => $columnData['FRONT_REMARK'],
                     'DELIVERY_STATUS_NAME' => Tool::paramConvert(\Yii::$app->params['deliveryStatus'])[$columnData['DELIVERY_STATUS']]['label'] ?? '',
                 ];
-                
+
                 fputcsv($this->_fp, Tool::arrTextConvert($columnAccept));
                 unset($percent, $columnData, $columnAccept);
             }
@@ -1561,14 +1561,14 @@ ORDER;
         // 查询订单数据
         // 使用新的查询对象，禁用查询缓存，确保获取最新数据
         $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')
-             ->join('LEFT JOIN', ORDER::tableName() . ' AS O', 'OG.ORDER_SN=O.SN')
-             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
-             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
-             ->asArray()
-             ->noCache(); // 禁用查询缓存
+            ->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')
+            ->join('LEFT JOIN', ORDER::tableName() . ' AS O', 'OG.ORDER_SN=O.SN')
+            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
+            ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
+            ->asArray()
+            ->noCache(); // 禁用查询缓存
 
         // 添加详细的调试信息
         $rawSql = $query->createCommand()->getRawSql();
@@ -1606,7 +1606,7 @@ ORDER;
         if(count($nativeResults) > 0 && count($oderList) < count($nativeResults)) {
             $oderList = $nativeResults;
         }
-        
+
         if ($oderList) {
             $userId = '';
             $userName = '';
@@ -1825,7 +1825,7 @@ EOT;
                             {$orderDetails}
                         </table>
                         
-                        <table border="1" width="100%" >
+                        <table border="1" width="100%" style="table-layout: auto;">
                             <tr style="text-align: left; font-weight: normal; font-size: 12px; width: 100%; padding: 5px 5px;">
                                 <th style="width: 30px;">No.</th>
                                 <th style="white-space: nowrap; word-break: break-word; ">Product Code</th>