订单修改

frontendApi/modules/v1/controllers/ShopController.php

@@ -439,7 +439,7 @@ class ShopController extends BaseController {
      */
     public function actionOwnOrder() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " O.USER_ID=:USER_ID AND ((O.CREATE_USER='{$uname}' AND O.ORDER_TYPE='FX') OR (O.CREATE_USER<>'{$uname}' AND O.ORDER_TYPE='ZC')) AND O.IS_DELETE = 0";
+        $condition = " O.USER_ID=:USER_ID AND ((O.CREATE_USER='{$uname}' AND O.ORDER_TYPE='FX') OR (O.CREATE_USER<>'{$uname}' AND O.ORDER_TYPE='ZC')) AND O.CONSIGNEE='{$uname}' AND O.IS_DELETE = 0";
         $params[':USER_ID'] = \Yii::$app->user->id;
         $orderQuery = Order::find()
             ->alias('O')
@@ -496,13 +496,14 @@ class ShopController extends BaseController {
     /**
      * 会员订单.(给别人复消、给别人报单、给别人升级)
      * 给别人复消：创建人是自己、USER_ID不是自己、ORDER_TYPE=FX
-     * 给别人报单：创建人是自己、USER_ID不是自己、ORDER_TYPE=ZC
+     * 给别人报单：创建人是自己、USER_ID是自己、ORDER_TYPE=ZC、收货人不是自己
      * 给别人升级：创建人是自己、USER_ID不是自己、ORDER_TYPE=ZC
      */
     public function actionMemberOrder() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " O.USER_ID<>:USER_ID AND O.CREATE_USER='{$uname}' AND O.IS_DELETE = 0";
-        $params[':USER_ID'] = \Yii::$app->user->id;
+        $condition = "  O.CONSIGNEE='{$uname}' AND O.CREATE_USER='{$uname}' AND O.IS_DELETE = 0";
+//        $params[':USER_ID'] = \Yii::$app->user->id;
+        $params = [];
         $orderQuery = Order::find()
             ->alias('O')
             ->where($condition, $params)