diff --git a/app/Model/Sku.php b/app/Model/Sku.php index 8180c79..91e27ef 100644 --- a/app/Model/Sku.php +++ b/app/Model/Sku.php @@ -90,7 +90,7 @@ class Sku extends Model ->whereIn('spu_id',$spuIds) ->where('is_del',GoodCode::SKU_IS_NO_DEL) ->where('saleable',GoodCode::LISTING) - ->where('is_add_staple_food',GoodCode::IS_NOT_ADD_STAPLE_FOOD) +// ->where('is_add_staple_food',GoodCode::IS_NOT_ADD_STAPLE_FOOD) ->orderBy('sort') ->select(['id','spu_id','title','image_ids','price','param','extra','total_stock','surplus_stock','order_num','is_add_staple_food','occupied','chef_id']) ->get(); diff --git a/app/Service/Api/Good/MealListService.php b/app/Service/Api/Good/MealListService.php index 18ff994..85f2cc9 100644 --- a/app/Service/Api/Good/MealListService.php +++ b/app/Service/Api/Good/MealListService.php @@ -14,6 +14,7 @@ use App\Cache\Redis\Api\ApiRedisKey; use App\Cache\Redis\Api\GoodCache; use App\Cache\Redis\Api\SiteCache; use App\Cache\Redis\RedisCache; +use App\Constants\Common\GoodCode; use App\Service\Api\BaseService; use App\Service\ServiceTrait\Common\CycleTrait; use Hyperf\Di\Annotation\Inject; @@ -66,8 +67,10 @@ class MealListService extends BaseService $stockKey = ApiRedisKey::goodStockKey((int)$cycleId,(int)$siteInfo['kitchen_id']); foreach ($data as &$item) { - foreach ($item['sku_list'] as &$v) { + foreach ($item['sku_list'] as $skuKey => &$v) { $v['surplus_stock'] = $this->redisCache->zScore($stockKey,$v['id']) ?? 0; + + if ($v['is_add_staple_food'] == GoodCode::IS_ADD_STAPLE_FOOD) unset($item['sku_list'][$skuKey]); } }