From d9698b5e13978afdd0481313f639bd73891365e8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sun, 28 Sep 2025 10:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E5=BA=97=E9=93=BA=E4=BD=BF=E7=94=A8=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ShopInfoController.java | 9 ++++++++ .../controller/admin/ACouponController.java | 2 +- .../czg/account/service/ShopInfoService.java | 2 ++ .../service/MkShopCouponRecordService.java | 2 +- .../service/impl/ShopInfoServiceImpl.java | 21 +++++++++++++++++++ .../impl/MkShopCouponRecordServiceImpl.java | 13 ++++++------ 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java index 5f096f5c..e35f3662 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java @@ -46,6 +46,15 @@ public class ShopInfoController { return CzgResult.success(shopInfoService.get(pageDTO, shopName, status, isHeadShop)); } + /** + * 店铺的 店铺列表 + * + */ + @GetMapping("/otherShop") + public CzgResult> getShopByMainId(PageDTO pageDTO, String shopName, Integer status) { + return CzgResult.success(shopInfoService.getShopByMainId(pageDTO, shopName, status)); + } + /** * 店铺详情 * 权限标识: shopInfo:detail diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java index 308a4393..7b778692 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java @@ -158,7 +158,7 @@ public class ACouponController { @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, MkShopCouponRecordDTO param) { - Page data = couponRecordService.getRecordByUser(param, startTime, endTime); + Page data = couponRecordService.getRecordByShopUser(param, startTime, endTime); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index 4dd9cf53..560f1dae 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -14,6 +14,8 @@ import java.util.List; public interface ShopInfoService extends IService { Page get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop); + Page getShopByMainId(PageDTO pageDTO, String shopName, Integer status); + Boolean add(ShopInfoAddDTO shopInfoAddDTO); Boolean edit(ShopInfoEditDTO shopInfoEditDTO); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java index b1bbba17..e41ecd7d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java @@ -32,7 +32,7 @@ public interface MkShopCouponRecordService extends IService * 优惠券列表/已领取详情 */ Page getRecord(MkShopCouponRecordDTO param, String startTime, String endTime); - Page getRecordByUser(MkShopCouponRecordDTO param, String startTime, String endTime); + Page getRecordByShopUser(MkShopCouponRecordDTO param, String startTime, String endTime); /** * 发放券 统一方法 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 3de10ab2..42560eb0 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -374,6 +374,27 @@ public class ShopInfoServiceImpl extends ServiceImpl i return PageUtil.convert(new PageInfo<>(mapper.getSubList(lng, lat, distance))); } + @Override + public Page getShopByMainId(PageDTO pageDTO, String shopName, Integer status) { + Long loginId = (Long) StpKit.USER.getLoginId(); + ShopInfo shopInfo = getById(loginId); + QueryWrapper queryWrapper = new QueryWrapper(); + if (!"only".equals(shopInfo.getShopType())) { + if (shopInfo.getIsHeadShop() != 1) { + queryWrapper.eq(ShopInfo::getId, loginId); + } else { + queryWrapper.and(q -> { + q.eq(ShopInfo::getId, loginId).or(q1 -> { + q1.eq(ShopInfo::getMainId, loginId); + }); + }); + } + } else { + queryWrapper.eq(ShopInfo::getId, loginId); + } + return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper); + } + @Override public List findShopBranch(Long shopId) { Long mainIdByShopId = getMainIdByShopId(shopId); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index 5d94bb8a..2b8d140a 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -134,24 +134,23 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl getRecordByUser(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) { - AssertUtil.isNull(mkShopCouponRecordDTO.getShopId(), "店铺ID不能为空"); - AssertUtil.isNull(mkShopCouponRecordDTO.getUserId(), "用户ID不能为空"); + public Page getRecordByShopUser(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) { + AssertUtil.isNull(mkShopCouponRecordDTO.getShopUserId(), "店铺用户ID不能为空"); QueryWrapper recordQueryWrapper = new QueryWrapper(); recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId()) .eq(MkShopCouponRecord::getIsDel, 0) .eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus()) - .eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId()) + .eq(MkShopCouponRecord::getShopUserId, mkShopCouponRecordDTO.getShopUserId()) .orderBy(MkShopCouponRecord::getCreateTime).desc(); if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) { recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime); } Page recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class); if (mkShopCouponRecordDTO.getUserId() != null) { - UserInfo userInfo = userInfoService.getById(mkShopCouponRecordDTO.getUserId()); + ShopUser shopUser = shopUserService.getById(mkShopCouponRecordDTO.getShopUserId()); for (MkShopCouponRecordDTO record : recordPage.getRecords()) { - record.setHeadImg(userInfo.getHeadImg()); - record.setNickName(userInfo.getNickName()); + record.setHeadImg(shopUser.getHeadImg()); + record.setNickName(shopUser.getNickName()); } } return recordPage;