diff --git a/src/main/java/cn/com/tenlion/operator/enums/ThirdPartyEnum.java b/src/main/java/cn/com/tenlion/operator/enums/ThirdPartyEnum.java index 4f1d9bb..a9cbdb0 100644 --- a/src/main/java/cn/com/tenlion/operator/enums/ThirdPartyEnum.java +++ b/src/main/java/cn/com/tenlion/operator/enums/ThirdPartyEnum.java @@ -11,7 +11,9 @@ public enum ThirdPartyEnum { DGZZ("对公转账"), WX("微信"), - ZFB("支付宝"); + ZFB("支付宝"), + + XT("系统"); /** 2025年3月24日14:11:30 CBC 新增了 系统充值 */ private final String value; diff --git a/src/main/java/cn/com/tenlion/operator/pojo/vos/accountrecharge/UserRechargeVO.java b/src/main/java/cn/com/tenlion/operator/pojo/vos/accountrecharge/UserRechargeVO.java new file mode 100644 index 0000000..bbb5525 --- /dev/null +++ b/src/main/java/cn/com/tenlion/operator/pojo/vos/accountrecharge/UserRechargeVO.java @@ -0,0 +1,63 @@ +package cn.com.tenlion.operator.pojo.vos.accountrecharge; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: UserRechargeVO + * @Description: 用户充值 + * @Author: CodeFactory + * @Date: 2025-02-13 15:12:34 + * @Version: 3.0 + **/ +@ApiModel +public class UserRechargeVO { + + @ApiModelProperty(name = "rechargeMoney", value = "金额") + @CheckNumberAnnotation(name = "金额") + private Double rechargeMoney; + @ApiModelProperty(name = "userId", value = "用户") + @CheckEmptyAnnotation(name = "用户") + private String userId; + @ApiModelProperty(name = "createUserId", value = "操作人") + @CheckEmptyAnnotation(name = "操作人") + private String createUserId; + @ApiModelProperty(name = "code", value = "加密串") + @CheckEmptyAnnotation(name = "加密串") + private String code; + + public String getCode() { + return code == null ? "" : code.trim(); + } + + public void setCode(String code) { + this.code = code; + } + + public String getCreateUserId() { + return createUserId == null ? "" : createUserId.trim(); + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getUserId() { + return userId == null ? "" : userId.trim(); + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public Double getRechargeMoney() { + return rechargeMoney == null ? 0 : rechargeMoney; + } + + public void setRechargeMoney(Double rechargeMoney) { + this.rechargeMoney = rechargeMoney; + } +} diff --git a/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java index 3399610..982c5d3 100644 --- a/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/accountrecharge/impl/AccountRechargeServiceImpl.java @@ -594,6 +594,12 @@ public class AccountRechargeServiceImpl extends DefaultBaseService implements IA rechargePayResultDTO.setOrderMessage("付款信息已提交, 请等待平台核对"); updateOrgData(accountRechargeId, accountRechargeVO); return rechargePayResultDTO; + } else if(dto.getThirdParty().equals(ThirdPartyEnum.XT.getValue())) { + /** + * 保存充值信息 + * 2025年3月24日14:12:44 + */ + return rechargePayResultDTO; } else if (dto.getThirdParty().equals(ThirdPartyEnum.WX.getValue())) { PayResultDTO payResultDTO = WXPay.queryPay(accountRechargeId); // 成功