From c5b3cfeb7211ff1040d25f6cd02344f12655ab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 14:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/URechargeController.java | 6 +++++ .../market/service/MkShopRechargeService.java | 3 +++ .../com/czg/market/vo/RechargeListVO.java | 27 +++++++++++++++++++ .../impl/MkShopRechargeServiceImpl.java | 20 ++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/vo/RechargeListVO.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 2f0d7f93..47dd39c1 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 @@ -4,6 +4,7 @@ import com.czg.market.service.MkShopRechargeService; import com.czg.market.vo.MemberDetailVO; import com.czg.market.vo.MemberListVO; import com.czg.market.vo.MkShopRechargeVO; +import com.czg.market.vo.RechargeListVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import jakarta.annotation.Resource; @@ -34,4 +35,9 @@ public class URechargeController { return CzgResult.success(shopRechargeService.detail(shopId)); } + @GetMapping("/list") + public List getList() { + return CzgResult.success(shopRechargeService.getList(StpKit.USER.getLoginIdAsLong())); + } + } 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 d8e9a9da..8785573e 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 @@ -25,4 +25,7 @@ public interface MkShopRechargeService extends IService { BigDecimal checkRecharge(Long mainShopId, @NotNull(message = "店铺不能为空") Long shopId, Long userId, Long rechargeDetailId, @DecimalMin("0.01") BigDecimal money); void recharge(Long shopId, Long shopUserId, Long relatedId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum); + + Object getList(long loginIdAsLong); + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/RechargeListVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/RechargeListVO.java new file mode 100644 index 00000000..2d758e29 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/RechargeListVO.java @@ -0,0 +1,27 @@ +package com.czg.market.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class RechargeListVO { + /** + * 店铺id + */ + private Long shopId; + /** + * 店铺名称 + */ + private String shopName; + /** + * 金额 + */ + private BigDecimal amount; + /** + * 店铺logo + */ + 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 16a99bed..b742d260 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 @@ -23,6 +23,7 @@ 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.order.entity.OrderInfo; import com.czg.service.market.enums.OrderStatusEnums; import com.czg.utils.AssertUtil; @@ -186,4 +187,23 @@ public class MkShopRechargeServiceImpl extends ServiceImpl rechargeListVOS = new ArrayList<>(); + List shopUserList = shopUserService.list(new QueryWrapper().eq(ShopUser::getUserId, loginIdAsLong)); + if (shopUserList.isEmpty()) { + return rechargeListVOS; + } + Set shopIdList = shopUserList.stream().map(ShopUser::getSourceShopId).collect(Collectors.toSet()); + Map shopInfoMap = shopInfoService.list(new QueryWrapper().eq(ShopInfo::getId, shopIdList)).stream().collect(Collectors.toMap(ShopInfo::getId, item -> item)); + shopUserList.forEach(item -> { + ShopInfo shopInfo = shopInfoMap.getOrDefault(item.getSourceShopId(), new ShopInfo()); + rechargeListVOS.add(new RechargeListVO().setShopName(shopInfo.getShopName()) + .setShopId(shopInfo.getId()) + .setAmount(item.getAmount()) + .setLogo(shopInfo.getLogo())); + }); + return rechargeListVOS; + } }