Merge branch 'feature/1511-goods-type-filter' into dev

common/models/forms/OrderForm.php

@@ -536,7 +536,7 @@ class OrderForm extends Model
             $isResaleUmbrella = Cache::getSystemConfig()['isResaleUmbrella']['VALUE'];
             if($isResaleUmbrella){
                 $userId = Info::getUserIdByUserName($this->userName);
-                $userNetwork = UserNetwork::find()->where("USER_ID=:USER_ID AND (USER_ID='{$loginUserId}' OR INSTR(PARENT_UIDS,'{$loginUserId}')>0)", ['USER_ID'=>$userId])->count();
+                $userNetwork = UserNetwork::find()->where("USER_ID=:USER_ID AND INSTR(PARENT_UIDS,'{$loginUserId}')>0", ['USER_ID'=>$userId])->count();
                 if(!$userNetwork){
                     throw new Exception($this->userName.'不是您的伞下会员，不能为其复消！');
                 }
@@ -619,6 +619,7 @@ class OrderForm extends Model
         $orderModel->SN = 'OS'.$ordNo;
         $orderModel->DEC_SN = 'DS'.$ordNo;
         $orderModel->ORDER_TYPE = $this->type;
+        $orderModel->ORDER_CATEGORY = 'STUDIO';
         $orderModel->USER_ID = $userId;
         $orderModel->USER_NAME = $this->userName;
         $orderModel->ORDER_AMOUNT = $this->_decAmount;

frontendApi/modules/v1/controllers/UserController.php

@@ -318,7 +318,7 @@ class UserController extends BaseController {
 //            $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
 //        }
         if($isStudio==1){
-            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0 OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
+            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0) OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
         }else{
             $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
         }
@@ -374,7 +374,7 @@ class UserController extends BaseController {
         $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
 
         if($isStudio==1){
-            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0 OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
+            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0) OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
         }else{
             $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
         }