diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java index 0b0d66b3..eeeedb92 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java @@ -66,6 +66,9 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl page = pageAs(PageUtil.buildPage(), queryWrapper, MkLimitTimeDiscountDTO.class); + if (mainShopId.equals(shopId)) { + return page; + } for (MkLimitTimeDiscountDTO record : page.getRecords()) { if (record.getFoodType() == 2 && StrUtil.isNotBlank(record.getFoods())) { List foodIds = Arrays.stream(record.getFoods().split(",")) @@ -73,7 +76,8 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl ids = productService.listAs(QueryWrapper.create().select(Product::getId).in(Product::getId, foodIds), String.class); + List ids = productService.listAs(QueryWrapper.create().select(Product::getId) + .eq(Product::getShopId, shopId).in(Product::getSyncId, foodIds), String.class); if (CollUtil.isEmpty(ids)) { record.setFoods(""); } else {