Explorar o código

会员端订单导出bugfix

kevin_zhangl %!s(int64=3) %!d(string=hai) anos
pai
achega
bc5d382e5c

+ 4 - 2
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 = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
         $params = [
             ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
@@ -747,7 +747,7 @@ ORDER;
             $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',
+                'from' => ApproachDecOrder::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'],
@@ -758,6 +758,8 @@ ORDER;
             ]);
         }
 
+        LoggerTool::info($data['list']);
+
         $userId = '';
         $userName = '';
         $address = '';

+ 0 - 1
frontendEle/src/views/shop/dec-order-list.vue

@@ -145,7 +145,6 @@
                     } );
 
                     _this.tableData=settingArr;
-                    console.log('11111',_this.tableData);
                     _this.getSpanArr(_this.tableData);
                 });
             },