From 6084bf847bd4889d3042eda736aa21913a186e35 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 19 Dec 2025 17:56:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/GbWareController.java | 2 +- .../com/czg/controller/user/UGbOrderController.java | 2 +- .../java/com/czg/market/service/GbWareService.java | 2 +- .../service/market/service/impl/GbWareServiceImpl.java | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java index 89615e5a9..708d5b98d 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/GbWareController.java @@ -58,7 +58,7 @@ public class GbWareController { if (param.getShopId() == null) { param.setShopId(StpKit.USER.getShopId()); } - return CzgResult.success(wareService.getGbWarePage(param, param.getShopId())); + return CzgResult.success(wareService.getGbWarePage(param, param.getShopId(), true)); } @PostMapping("/addGbWare") diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java index 457ccb1aa..b3ed19e21 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java @@ -52,7 +52,7 @@ public class UGbOrderController { param.setOnlineStatus(1); param.setWareName(wareName); param.setGroupPeopleNum(groupPeopleNum); - Page data = wareService.getGbWarePage(param, shopId); + Page data = wareService.getGbWarePage(param, shopId, false); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/GbWareService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/GbWareService.java index c12a7c2ae..d88dcb503 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/GbWareService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/GbWareService.java @@ -15,7 +15,7 @@ import com.mybatisflex.core.service.IService; public interface GbWareService extends IService { //拼团 活动 注意分店 主店的 问题 - Page getGbWarePage(GbWareQueryParamDTO param, Long shopId); + Page getGbWarePage(GbWareQueryParamDTO param, Long shopId, boolean isAdmin); //添加 boolean addGbWare(GbWareDTO param); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/GbWareServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/GbWareServiceImpl.java index 8f9b8e310..1ba892c01 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/GbWareServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/GbWareServiceImpl.java @@ -30,7 +30,7 @@ public class GbWareServiceImpl extends ServiceImpl impleme @Override - public Page getGbWarePage(GbWareQueryParamDTO param, Long shopId) { + public Page getGbWarePage(GbWareQueryParamDTO param, Long shopId, boolean isAdmin) { if (!shopInfoService.checkSwitch(shopId, ShopSwitchTypeEnum.GROUP_BUY)) { return new Page<>(); } @@ -53,9 +53,11 @@ public class GbWareServiceImpl extends ServiceImpl impleme }); }); Page page = page(Page.of(param.getPage(), param.getSize()), queryWrapper); - page.getRecords().forEach(item -> { - item.setShopId(shopId); - }); + if (!isAdmin) { + page.getRecords().forEach(item -> { + item.setShopId(shopId); + }); + } return page; }