From 5d9b16b455079407acdcff587d6152ef6cb6bc55 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 03 Jan 2025 17:22:54 +0800
Subject: [PATCH] feat(mall): 为 ApiGrowChargeDto 中的 amount 字段添加 NotNull 注解
---
src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
index b1ee2da..e552f71 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
@@ -563,12 +563,14 @@
agentProducer.sendBuyVipSuccessMsg(mallCharge.getId());
- return new FebsResponse().success().data("操作成功");
+ return new FebsResponse().success().message("操作成功");
}
@Override
public FebsResponse growCharge(ApiGrowChargeDto apiGrowChargeDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ApiGoChargeVo apiGoChargeVo = new ApiGoChargeVo();
BigDecimal amount = apiGrowChargeDto.getAmount();
if(BigDecimal.ZERO.compareTo(amount) >= 0){
@@ -595,7 +597,7 @@
if(runVipNext == null){
throw new FebsException("无法升级会员权益");
}
- if(runVip.getOrderNumber() < runVipNext.getOrderNumber()){
+ if(runVip.getOrderNumber() >= runVipNext.getOrderNumber()){
throw new FebsException("用户无法升级");
}
@@ -661,13 +663,28 @@
mallCharge.setVipCode(runVipGrow.getLevelNext());
}
}else{
- if(runVipGrow.getAmountAll().compareTo(amount) <= 0){
- mallCharge.setVipCode(runVipGrow.getLevelNext());
+ if(runVipNext.getPresentPrice().compareTo(amount) <= 0){
+ mallCharge.setVipCode(runVipNext.getVipCode());
}
}
mallChargeMapper.insert(mallCharge);
- return new FebsResponse().success().data("操作成功");
+
+ apiGoChargeVo.setFailTime(mallCharge.getFailTime());
+ apiGoChargeVo.setAddress(mallCharge.getAddress());
+ apiGoChargeVo.setAmount(mallCharge.getAmount());
+ apiGoChargeVo.setSysAddress(mallCharge.getSysAddress());
+ apiGoChargeVo.setSysAddressType(mallCharge.getType());
+
+ /**
+ * 充值接口调用后，发送一个延时队列
+ * 功能：延迟时间为【failMinutes】后，更新充值记录为失败。
+ */
+ ApiMemberChargeFailDto apiMemberChargeFailDto = new ApiMemberChargeFailDto();
+ apiMemberChargeFailDto.setChargeId(mallCharge.getId());
+ apiMemberChargeFailDto.setFailTime(Integer.parseInt(failMinutes) * 60L* 1000L);
+ agentProducer.sendMemberChargeFailMsg(apiMemberChargeFailDto);
+ return new FebsResponse().success().data(apiGoChargeVo);
}
@Override
--
Gitblit v1.9.1