From 25a7ac1f6820656926e1faa10efad5bf67238a5a 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:27:33 +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 --- .../java/com/czg/controller/user/URechargeController.java | 7 ++++--- .../java/com/czg/market/service/MkShopRechargeService.java | 4 +++- .../market/service/impl/MkShopRechargeServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) 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 47dd39c13..d2ebd6a3c 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,8 +1,6 @@ package com.czg.controller.user; 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; @@ -35,8 +33,11 @@ public class URechargeController { return CzgResult.success(shopRechargeService.detail(shopId)); } + /** + * 储值列表 + */ @GetMapping("/list") - public List getList() { + public CzgResult> 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 8785573e7..2db24b85a 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 @@ -3,12 +3,14 @@ package com.czg.market.service; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.market.dto.MkShopRechargeDTO; import com.czg.market.vo.MkShopRechargeVO; +import com.czg.market.vo.RechargeListVO; import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkShopRecharge; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.List; /** * 充值配置表 服务层。 @@ -26,6 +28,6 @@ public interface MkShopRechargeService extends IService { void recharge(Long shopId, Long shopUserId, Long relatedId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum); - Object getList(long loginIdAsLong); + List getList(long loginIdAsLong); } 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 b742d2602..0219985ac 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 @@ -189,7 +189,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl getList(long loginIdAsLong) { ArrayList rechargeListVOS = new ArrayList<>(); List shopUserList = shopUserService.list(new QueryWrapper().eq(ShopUser::getUserId, loginIdAsLong)); if (shopUserList.isEmpty()) {