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 36f08d221..00450d125 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,7 +5,7 @@ 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.dto.MkDistributionWithdrawFlowDTO; +import com.czg.market.entity.MkDistributionWithdrawFlow; import com.czg.market.service.*; import com.czg.market.vo.*; import com.czg.order.dto.MkDistributionPayDTO; @@ -115,15 +115,15 @@ public class DistributionController { /** * 用户提现列表 - * @param shopUserId 用户id + * @param userId 用户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), + public CzgResult> withdrawPageInfo(@RequestParam(required = false) Long userId, @RequestParam(required = false) String key, + @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) { + return CzgResult.success(withdrawFlowService.withdrawPageInfo(StpKit.USER.getShopId(), userId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime), StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), key)); } diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java index 15c669787..8d3a861f6 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java @@ -136,20 +136,18 @@ public class UDistributionController { /** * 提现详情 */ - @PostMapping("/withdraw/detail") - public CzgResult> withdraw(@RequestParam Long id, @RequestParam Long shopId) { - return CzgResult.success(distributionUserService.withdrawDetail(StpKit.USER.getLoginIdAsLong(), shopId, id)); + @GetMapping("/withdraw/detail") + public CzgResult> withdraw(@RequestParam Long id) { + return CzgResult.success(distributionUserService.withdrawDetail(StpKit.USER.getLoginIdAsLong(), id)); } /** * 提现记录 - * @param shopId - * @return */ @GetMapping("/withdraw/flow") - public CzgResult> withArdwFlow(@RequestParam Long shopId) { - return CzgResult.success(withdrawFlowService.pageInfo(StpKit.USER.getLoginIdAsLong(), shopId)); + public CzgResult> withArdwFlow() { + return CzgResult.success(withdrawFlowService.pageInfo(StpKit.USER.getLoginIdAsLong())); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java index cfef5bd83..625913a30 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java @@ -29,4 +29,6 @@ public class MkDistributionWithdrawFlowDTO implements Serializable { @NotNull(message = "提现金额不为空") @DecimalMin(value = "30", message = "提现金额不能小于30") private BigDecimal amount; + + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java index 668182b3e..fdeeb60bc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java @@ -44,7 +44,7 @@ public class MkDistributionWithdrawFlow implements Serializable { /** * 店铺用户id */ - private Long shopUserId; + private Long userId; /** * 提现金额 @@ -83,4 +83,10 @@ public class MkDistributionWithdrawFlow implements Serializable { */ private String status; + + @Column(ignore = true) + private String nickName; + @Column(ignore = true) + private String phone; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java index 074afee85..e066efebb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java @@ -116,5 +116,5 @@ public interface MkDistributionUserService extends IService Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO); - Map withdrawDetail(long userId, Long shopId, Long id); + Map withdrawDetail(long userId, Long id); } 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 d3ad2c3d3..5bfefcece 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 @@ -1,6 +1,5 @@ package com.czg.market.service; -import com.czg.market.dto.MkDistributionWithdrawFlowDTO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkDistributionWithdrawFlow; @@ -15,7 +14,7 @@ import java.time.LocalDateTime; */ public interface MkDistributionWithdrawFlowService extends IService { - Page pageInfo(long userId, Long shopId); + Page pageInfo(long userId); - Page withdrawPageInfo(Long shopId, Long shopUserId, LocalDateTime startTime, LocalDateTime endTime, String key); + Page withdrawPageInfo(Long shopId, Long userId, LocalDateTime startTime, LocalDateTime endTime, String key); } 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 eeb41160c..ccd5dded3 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,7 +430,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl withdrawDetail(long userId, Long shopId, Long id) { - ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId); - MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getId, id).eq(MkDistributionWithdrawFlow::getShopUserId, shopUserInfo.getId())); + public Map withdrawDetail(long userId, Long id) { + MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getId, id).eq(MkDistributionWithdrawFlow::getUserId, userId)); AssertUtil.isNull(flow, "提现记录不存在"); AssertUtil.isTrue(TableValueConstant.DistributionWithdrawFlow.Status.FINISH.getCode().equals(flow.getStatus()), "已经提现"); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java index 7689098ab..e3a05cbd3 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java @@ -1,8 +1,10 @@ package com.czg.service.market.service.impl; +import cn.hutool.core.util.StrUtil; import com.czg.account.entity.ShopUser; +import com.czg.account.entity.UserInfo; import com.czg.account.service.ShopUserService; -import com.czg.market.dto.MkDistributionWithdrawFlowDTO; +import com.czg.utils.MyQueryWrapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; @@ -10,10 +12,11 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.market.entity.MkDistributionWithdrawFlow; import com.czg.market.service.MkDistributionWithdrawFlowService; import com.czg.service.market.mapper.MkDistributionWithdrawFlowMapper; -import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; + /** * 提现记录表 服务层实现。 * @@ -26,8 +29,34 @@ public class MkDistributionWithdrawFlowServiceImpl extends ServiceImpl pageInfo(long userId, Long shopId) { - ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId); - return page(PageUtil.buildPage(), new QueryWrapper().eq(MkDistributionWithdrawFlow::getShopUserId, shopUserInfo.getId())); + public Page pageInfo(long userId) { + return page(PageUtil.buildPage(), new QueryWrapper().eq(MkDistributionWithdrawFlow::getUserId, userId)); + } + + @Override + public Page withdrawPageInfo(Long shopId, Long userId, LocalDateTime startTime, LocalDateTime endTime, String key) { + QueryWrapper queryWrapper = new MyQueryWrapper() + .selectAll(MkDistributionWithdrawFlow.class) + .leftJoin(UserInfo.class).on(UserInfo::getId, MkDistributionWithdrawFlow::getUserId) + .select(UserInfo::getNickName, UserInfo::getPhone) + .eq(MkDistributionWithdrawFlow::getShopId, shopId).eq(MkDistributionWithdrawFlow::getUserId, userId) + .ge(MkDistributionWithdrawFlow::getCreateTime, startTime) + .le(MkDistributionWithdrawFlow::getCreateTime, endTime); + if (StrUtil.isNotBlank(key)){ + queryWrapper.and(and -> { + and.or(or -> { + or.like(ShopUser::getId, key); + }); + + and.or(or -> { + or.like(ShopUser::getNickName, key); + }); + + and.or(or -> { + or.like(ShopUser::getPhone, key); + }); + }); + } + return page(PageUtil.buildPage(), queryWrapper); } }