工作室复消页面，只显示“工作室复消”商品

frontendApi/modules/v1/controllers/ShopController.php

@@ -187,7 +187,7 @@ class ShopController extends BaseController {
         $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
         $condition = " AND STATUS=1";
         if($isStudio==1){
-            $condition .= " AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR (FIND_IN_SET(4,GIFT_TYPE)>0)";
+            $condition .= " AND  (FIND_IN_SET(4,GIFT_TYPE)>0";
         }
         $condition.= ")";
 
@@ -196,7 +196,7 @@ class ShopController extends BaseController {
             'from' => ShopGoods::tableName(),
         ]);
         foreach ($data['list'] as $key => $value) {
-            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;  
+            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
         }
         return static::notice($data);
     }
@@ -239,4 +239,4 @@ class ShopController extends BaseController {
         }
     }
 
-}
+}