|
|
@@ -317,6 +317,9 @@ public class PosFoodController extends BaseController {
|
|
|
// query.like("name",keyword);
|
|
|
query.apply("BINARY name LIKE CONCAT('%', {0}, '%')", keyword);
|
|
|
List<PosFood> folist = posFoodService.list(query);
|
|
|
+ // 2026-10-19 统一口径:规格唯一来源 food_spec_relation(与菜单/详情一致)
|
|
|
+ Map<Long, List<FoodSpecs>> __specMap = loadFoodSpecsMap(
|
|
|
+ folist.stream().map(PosFood::getId).collect(Collectors.toList()));
|
|
|
QueryWrapper<PosStore> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq("off_shelf", "0")
|
|
|
// .and(i->i.like("pos_name", keyword).or().like("brief_introduction",keyword));
|
|
|
@@ -335,7 +338,7 @@ public class PosFoodController extends BaseController {
|
|
|
org.put("introduce", folist.get(i).getIntroduce());
|
|
|
org.put("recommend", folist.get(i).getRecommend());
|
|
|
org.put("stackingUp", folist.get(i).getStackingUp());
|
|
|
- org.put("foodSku", JSONArray.parseArray(folist.get(i).getFoodSku()));
|
|
|
+ org.put("foodSku", buildFoodSkuArray(__specMap.getOrDefault(folist.get(i).getId(), new ArrayList<>())));
|
|
|
all.add(org);
|
|
|
}
|
|
|
}
|
|
|
@@ -550,6 +553,9 @@ public class PosFoodController extends BaseController {
|
|
|
}
|
|
|
IPage<PosFood> list = posFoodService.page(food, queryWrapper);
|
|
|
List<PosFood> foodlist = list.getRecords();
|
|
|
+ // 2026-10-19 统一口径:规格唯一来源 food_spec_relation(与菜单/详情一致)
|
|
|
+ Map<Long, List<FoodSpecs>> __specMap = loadFoodSpecsMap(
|
|
|
+ foodlist.stream().map(PosFood::getId).collect(Collectors.toList()));
|
|
|
JSONArray all = new JSONArray();
|
|
|
for (int i = 0; i < foodlist.size(); i++) {
|
|
|
PosStore store = posStoreService.getById(foodlist.get(i).getMdid());
|
|
|
@@ -564,7 +570,7 @@ public class PosFoodController extends BaseController {
|
|
|
org.put("introduce", foodlist.get(i).getIntroduce());
|
|
|
org.put("recommend", foodlist.get(i).getRecommend());
|
|
|
org.put("stackingUp", foodlist.get(i).getStackingUp());
|
|
|
- org.put("foodSku", JSONArray.parseArray(foodlist.get(i).getFoodSku()));
|
|
|
+ org.put("foodSku", buildFoodSkuArray(__specMap.getOrDefault(foodlist.get(i).getId(), new ArrayList<>())));
|
|
|
all.add(org);
|
|
|
}
|
|
|
}
|