From a12b87d47e1fdd227f2dc0b321153011a10c95d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Sun, 28 Sep 2025 17:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=8F=AF=E7=94=A8=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/URechargeController.java | 12 +++++++- .../market/service/MkShopRechargeService.java | 2 ++ .../market/vo/MkShopRechargeShopListVO.java | 17 +++++++++++ .../impl/MkShopRechargeServiceImpl.java | 30 ++++++++++++++++--- .../service/impl/OrderInfoServiceImpl.java | 2 +- 5 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkShopRechargeShopListVO.java diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java index d2ebd6a3c..c932ccc84 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java @@ -1,6 +1,7 @@ package com.czg.controller.user; import com.czg.market.service.MkShopRechargeService; +import com.czg.market.vo.MkShopRechargeShopListVO; import com.czg.market.vo.MkShopRechargeVO; import com.czg.market.vo.RechargeListVO; import com.czg.resp.CzgResult; @@ -34,7 +35,16 @@ public class URechargeController { } /** - * 储值列表 + * 可用店铺列表 + * @param shopId 店铺id + */ + @GetMapping("/config/shopList") + public CzgResult> shopList(@RequestParam Long shopId, @RequestParam(required = false) String shopName) { + return CzgResult.success(shopRechargeService.shopList(shopId, shopName)); + } + + /** + * 充值列表 */ @GetMapping("/list") public CzgResult> getList() { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java index 16bead696..e1efc6c2f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java @@ -2,6 +2,7 @@ package com.czg.market.service; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.market.dto.MkShopRechargeDTO; +import com.czg.market.vo.MkShopRechargeShopListVO; import com.czg.market.vo.MkShopRechargeVO; import com.czg.market.vo.RechargeListVO; import com.mybatisflex.core.service.IService; @@ -31,4 +32,5 @@ public interface MkShopRechargeService extends IService { List getList(long loginIdAsLong); + List shopList(Long shopId, String shopName); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkShopRechargeShopListVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkShopRechargeShopListVO.java new file mode 100644 index 000000000..22aec627e --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkShopRechargeShopListVO.java @@ -0,0 +1,17 @@ +package com.czg.market.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class MkShopRechargeShopListVO implements Serializable { + private static final long serialVersionUID = 1L; + private String shopName; + private Long id; + private String logo; + + +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index d50ca126d..1928a2961 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -20,10 +20,7 @@ import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.MkShopRechargeDetailService; import com.czg.market.service.ShopCouponService; -import com.czg.market.vo.CouponInfoVO; -import com.czg.market.vo.MkShopRechargeDetailVO; -import com.czg.market.vo.MkShopRechargeVO; -import com.czg.market.vo.RechargeListVO; +import com.czg.market.vo.*; import com.czg.order.entity.OrderInfo; import com.czg.service.market.enums.OrderStatusEnums; import com.czg.utils.AssertUtil; @@ -214,4 +211,29 @@ public class MkShopRechargeServiceImpl extends ServiceImpl shopList(Long shopId, String shopName) { + Long mainShopId = shopInfoService.getMainIdByShopId(shopId); + MkShopRechargeVO rechargeVO = detail(shopId); + List shopIdList = rechargeVO.getShopIdList(); + + QueryWrapper queryWrapper = new QueryWrapper().like(ShopInfo::getShopName, shopName); + if ("all".equals(rechargeVO.getUseType())) { + queryWrapper.and(q -> { + q.eq(ShopInfo::getMainId, mainShopId).or(q1 -> { + q1.eq(ShopInfo::getId, mainShopId); + }); + }); + }else { + shopIdList.add(shopId); + queryWrapper.in(ShopInfo::getId, shopIdList); + } + + + return shopInfoService.list(queryWrapper) + .stream() + .map(shop -> BeanUtil.copyProperties(shop, MkShopRechargeShopListVO.class)) + .toList(); + } } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index d083e039d..e6ba08126 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -824,7 +824,7 @@ public class OrderInfoServiceImpl extends ServiceImpl