Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--douyin

app/api/logic/GoodsLogic.php

@@ -32,6 +32,7 @@ class GoodsLogic extends BaseLogic
         $platform_appid = $params['platform_appid']??0;
         $platform_value = $params['platform_value']??0;
         if($type == 'category'){
+            $where[] = ['goods_status','=',1];
             $where[] = ['goods_category_id','=',$id];
             $where[] = ['user_id','=',0];
             $where[] = ['is_agent','=',0];
@@ -51,7 +52,7 @@ class GoodsLogic extends BaseLogic
             ])->select()->toArray();
         }else{
             $goods_category_id = Goods::where('id',$id)->value('goods_category_id');
-            $goods = Goods::where(['goods_category_id'=>$goods_category_id,'user_id'=>0,'is_agent'=>0,'is_activity'=>0,'platform_value'=>0])->visible([
+            $goods = Goods::where(['goods_category_id'=>$goods_category_id,'user_id'=>0,'is_agent'=>0,'is_activity'=>0,'platform_value'=>0,'goods_status'=>1])->visible([
                 'id','goods_image','goods_name','goods_banners','good_unit','sell_num','base_service_fee',
                 'service_total','service_fee','service_image','fee_schedule','warranty_period','goods_payment_type','goods_category_id'
             ])->select()->toArray();