فهرست منبع

会员端订单导出pdf bugfix

kevin_zhangl 3 سال پیش
والد
کامیت
a3ef622a88
1فایلهای تغییر یافته به همراه16 افزوده شده و 1 حذف شده
  1. 16 1
      frontendApi/modules/v1/controllers/ShopController.php

+ 16 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -486,7 +486,7 @@ class ShopController extends BaseController {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
         $orderSn = \Yii::$app->request->get('orderSn');
 
-        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
+        $condition = " ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
         $params = [
             ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
@@ -759,6 +759,21 @@ ORDER;
             ],
         ]);
 
+        if (!$data['list']) {
+            $data = ApproachDecOrder::lists($condition, $params, [
+                'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,OG.*,OD.PROVINCE,OD.CITY,OD.COUNTY,OD.ADDRESS,OD.MOBILE,OD.PAY_AT,OD.ORDER_AMOUNT',
+                'orderBy' => 'DO.CREATED_AT DESC',
+                'from' => DecOrder::tableName() . ' AS DO',
+                'join' => [
+                    ['LEFT JOIN', User::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
+                    ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
+                    ['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
+                    ['LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN'],
+                    ['LEFT JOIN', ApproachOrder::tableName() . ' AS OD', 'OD.SN=DO.ORDER_SN'],
+                ],
+            ]);
+        }
+
         $userId = '';
         $userName = '';
         $address = '';