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 a1026514..f1f1606c 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 @@ -130,4 +130,12 @@ public class UDistributionController { return CzgResult.success(distributionUserService.getInviteUser(id, page, size)); } + /** + * 提现详情 + */ + @PostMapping("/withdraw/detail") + public CzgResult> withdraw(@RequestParam Long id, @RequestParam Long shopId) { + return CzgResult.success(distributionUserService.withdrawDetail(StpKit.USER.getLoginIdAsLong(), shopId, id)); + } + } 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 57aad8ee..668182b3 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 @@ -14,6 +14,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * 提现记录表 实体类。 @@ -26,6 +27,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Table("mk_distribution_withdraw_flow") +@Accessors(chain = true) public class MkDistributionWithdrawFlow implements Serializable { @Serial 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 6c28a6c3..074afee8 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,4 +116,5 @@ public interface MkDistributionUserService extends IService Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO); + Map withdrawDetail(long userId, Long shopId, Long id); } diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java b/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java index 442edd00..a7a532ea 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java @@ -60,6 +60,25 @@ public interface TableValueConstant { } + interface DistributionWithdrawFlow { + @Getter + enum Status { + PENDING("pending", "提现中"), + SUB("sub", "系统扣减"), + OPEN("open", "分销员购买"), + FINISH("finish", "已提现"), + SELF_RECHARGE("self_recharge", "自助充值"); + private final String code; + private final String msg; + + Status(String code, String msg) { + this.code = code; + this.msg = msg; + } + } + + } + interface DistributionFlow { @Getter enum Status { 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 6d411931..52141f41 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 @@ -75,6 +75,8 @@ 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())); + AssertUtil.isNull(flow, "提现记录不存在"); + AssertUtil.isTrue(TableValueConstant.DistributionWithdrawFlow.Status.FINISH.getCode().equals(flow.getStatus()), "已经提现"); + + return Map.of( + "mchId", appWxService.config.mchId, + "appId", appWxService.config.appId, + "package", flow.getPackageInfo() + ); } }