kevin_zhangl пре 2 година
родитељ
комит
483d2e95df
1 измењених фајлова са 2 додато и 7 уклоњено
  1. 2 7
      frontendApi/modules/v1/controllers/ShopController.php

+ 2 - 7
frontendApi/modules/v1/controllers/ShopController.php

@@ -435,7 +435,6 @@ class ShopController extends BaseController {
     /**
      * 我的订单.(自己复消+自己加入时的首单)
      * 创建人是自己+USER_ID是自己的复消单、创建人不是自己+USER_ID是自己的报单
-     * @return array
      * @throws HttpException
      */
     public function actionOwnOrder() {
@@ -491,8 +490,6 @@ class ShopController extends BaseController {
             unset($data['list'][$key]['ADDRESS'], $data['list'][$key]['CITY_NAME'], $data['list'][$key]['LGA_NAME'], $data['list'][$key]['PROVINCE']);
         }
 
-        return $data;
-
         return static::notice($data);
     }
 
@@ -501,7 +498,6 @@ class ShopController extends BaseController {
      * 给别人复消:创建人是自己、USER_ID不是自己、ORDER_TYPE=FX
      * 给别人报单:创建人是自己、USER_ID不是自己、ORDER_TYPE=ZC
      * 给别人升级:创建人是自己、USER_ID不是自己、ORDER_TYPE=ZC
-     * @return array
      */
     public function actionMemberOrder() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
@@ -556,7 +552,7 @@ class ShopController extends BaseController {
             unset($data['list'][$key]['ADDRESS'], $data['list'][$key]['CITY_NAME'], $data['list'][$key]['LGA_NAME'], $data['list'][$key]['PROVINCE']);
         }
 
-        return $data;
+        return static::notice($data);
     }
 
     /**
@@ -660,9 +656,8 @@ class ShopController extends BaseController {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
         $orderSn = \Yii::$app->request->get('orderSn');
 
-        $condition = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN AND O.IS_DELETE = 0";
+        $condition = " AND SN=:SN AND O.IS_DELETE = 0";
         $params = [
-            ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
         ];