From 11c3b4f1787cba1caac583efca66f9130a2ba8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 28 Oct 2025 11:42:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkDistributionLevelConfigServiceImpl.java | 6 ++++-- .../market/service/impl/MkDistributionUserServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java index 26003d46e..7afd5c48a 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java @@ -27,11 +27,13 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl { + int level = 1; + for (MkDistributionLevelConfigDTO item : levelConfigList) { MkDistributionLevelConfig config = BeanUtil.copyProperties(item, MkDistributionLevelConfig.class); config.setDistributionConfigId(id); config.setShopId(shopId); + config.setLevel(level++); saveOrUpdate(config); - }); + } } } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index a2fc96783..eeb41160c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -430,6 +430,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl Date: Tue, 28 Oct 2025 11:44:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkDistributionLevelConfigServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java index 7afd5c48a..761d1654c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java @@ -25,6 +25,8 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl Date: Tue, 28 Oct 2025 13:34:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DistributionController.java | 24 ++++++++++++++----- .../MkDistributionWithdrawFlowService.java | 4 ++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index dc28868b2..36f08d221 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -5,18 +5,15 @@ import cn.hutool.core.util.StrUtil; import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaCheckMainShop; import com.czg.market.dto.MkDistributionConfigDTO; -import com.czg.market.service.MkDistributionAmountFlowService; -import com.czg.market.service.MkDistributionConfigService; -import com.czg.market.service.MkDistributionFlowService; -import com.czg.market.service.MkDistributionUserService; +import com.czg.market.dto.MkDistributionWithdrawFlowDTO; +import com.czg.market.service.*; import com.czg.market.vo.*; import com.czg.order.dto.MkDistributionPayDTO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.utils.AssertUtil; -import com.czg.validator.group.UpdateGroup; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import jakarta.validation.groups.Default; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -39,6 +36,8 @@ public class DistributionController { private MkDistributionAmountFlowService distributionAmountFlowService; @Resource private MkDistributionFlowService distributionFlowService; + @Resource + private MkDistributionWithdrawFlowService withdrawFlowService; /** * 配置信息详情 @@ -114,6 +113,19 @@ public class DistributionController { } + /** + * 用户提现列表 + * @param shopUserId 用户id + * @param key 搜索 + * @param startTime 开始时间 + * @param endTime 结束时间 + */ + @GetMapping("/withdrawFlow") + public CzgResult> withdrawPageInfo(@RequestParam(required = false) Long shopUserId, @RequestParam(required = false) String key, + @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) { + return CzgResult.success(withdrawFlowService.withdrawPageInfo(StpKit.USER.getShopId(), shopUserId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime), + StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), key)); + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java index 18763db12..d3ad2c3d3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java @@ -5,6 +5,8 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkDistributionWithdrawFlow; +import java.time.LocalDateTime; + /** * 提现记录表 服务层。 * @@ -14,4 +16,6 @@ import com.czg.market.entity.MkDistributionWithdrawFlow; public interface MkDistributionWithdrawFlowService extends IService { Page pageInfo(long userId, Long shopId); + + Page withdrawPageInfo(Long shopId, Long shopUserId, LocalDateTime startTime, LocalDateTime endTime, String key); }