|
|
@@ -181,6 +181,7 @@ class GoodsService
|
|
|
$goodsSupplierId = $request->get('join_goods_supplier_id', null);
|
|
|
$goodsStatus = $request->get('goods_status', null);
|
|
|
$type = $request->get('type', '');
|
|
|
+ $requestClassify = $request->get('classify');
|
|
|
if ($categoryId != null) {
|
|
|
$categoryPath = SysCategory::where('category_id', $categoryId)->value('category_super_path');
|
|
|
$categoryPath .= '#' . $categoryId . '#';
|
|
|
@@ -238,6 +239,8 @@ class GoodsService
|
|
|
$query->where('join_goods_supplier_id', $goodsSupplierId);
|
|
|
})->when(!empty($goodsStatus), function ($query) use ($goodsStatus) {
|
|
|
$query->where('goods_status', $goodsStatus);
|
|
|
+ })->when(!empty($requestClassify), function ($query) use ($requestClassify) {
|
|
|
+ $query->where('goods_classify', $requestClassify);
|
|
|
})
|
|
|
->orderBy('goods_sort', 'DESC')
|
|
|
->orderBy('goods_addtimes', 'DESC')
|
|
|
@@ -583,6 +586,7 @@ class GoodsService
|
|
|
$categorySuperId = $request->get('category_super_id', '');
|
|
|
$joinGoodsCategoryId = $request->get('join_goods_category_id', '');
|
|
|
$type = $request->get('type', '');
|
|
|
+ $classify = $request->get('classify', '');
|
|
|
if (!$categoryIds && !$categorySuperId && !$joinGoodsCategoryId) {
|
|
|
return json_fail('参数异常');
|
|
|
}
|
|
|
@@ -631,7 +635,10 @@ class GoodsService
|
|
|
->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
|
|
|
->where('goods_running.goods_running_storage', '>', 0)
|
|
|
->whereIn('join_goods_category_id', $goodsCategoryIds)
|
|
|
- ->where('goods_status', 'ON');
|
|
|
+ ->where('goods_status', 'ON')
|
|
|
+ ->when(!empty($classify), function ($query) use ($classify) {
|
|
|
+ $query->where('goods_classify', $classify);
|
|
|
+ });
|
|
|
|
|
|
if ($type == 'dishes') {
|
|
|
$uid = JwtToken::getCurrentId();
|
gorden