From 86cc20a154707c8ebc3d26b090d43ec01d550e61 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 03 Jan 2025 14:23:28 +0800
Subject: [PATCH] feat(mall): 添加会员权益升级功能
---
src/main/java/cc/mrbird/febs/mall/controller/ApiRunVipController.java | 26 +++
src/main/java/cc/mrbird/febs/mall/dto/ApiGrowBuyDto.java | 25 +++
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 3
src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java | 306 ++++++++++++++++++++++++++++++++++++-
src/main/java/cc/mrbird/febs/mall/mapper/RunVipGrowMapper.java | 7
src/main/java/cc/mrbird/febs/common/enumerates/RunVipMoneyFlowTypeEnum.java | 5
src/main/java/cc/mrbird/febs/mall/dto/ApiGrowChargeDto.java | 28 +++
src/main/java/cc/mrbird/febs/mall/service/IRunVipService.java | 6
src/main/java/cc/mrbird/febs/mall/vo/ApiGrowInfoVo.java | 21 ++
src/main/java/cc/mrbird/febs/mall/entity/RunVipGrow.java | 28 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1
11 files changed, 445 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/RunVipMoneyFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/RunVipMoneyFlowTypeEnum.java
index 5c776f5..94848ad 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/RunVipMoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/RunVipMoneyFlowTypeEnum.java
@@ -8,6 +8,11 @@
/**
* 碳币兑换USDT
*/
+ COMMISSION_PAY_GROW(17,"升级权益，APP支付{}","升级权益，APP支付"),
+
+ /**
+ * 碳币兑换USDT
+ */
COMMISSION_PAY(16,"购买会员，APP支付{}","购买会员，APP支付"),
/**
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiRunVipController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiRunVipController.java
index bf8caa8..5a15e00 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiRunVipController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiRunVipController.java
@@ -72,6 +72,32 @@
return new FebsResponse().success().data(iRunVipService.getChargeList(apiChargeListDto));
}
+ @ApiOperation(value = "【权益升级】权益升级详情", notes = "【权益升级】权益升级详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiGrowInfoVo.class)
+ })
+ @PostMapping(value = "/growInfo")
+ public FebsResponse growInfo() {
+ return iRunVipService.growInfo();
+ }
+
+ @ApiOperation(value = "【权益升级】APP支付", notes = "【权益升级】APP支付")
+ @PostMapping(value = "/growBuy")
+ @SubmitRepeat
+ public FebsResponse growBuy(@RequestBody @Valid ApiGrowBuyDto apiGrowBuyDto) {
+ return iRunVipService.growBuy(apiGrowBuyDto);
+ }
+
+ @ApiOperation(value = "【权益升级】立即购买", notes = "【权益升级】立即购买")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiGoChargeVo.class)
+ })
+ @PostMapping(value = "/growCharge")
+ @SubmitRepeat
+ public FebsResponse growCharge(@RequestBody @Valid ApiGrowChargeDto apiGrowChargeDto) {
+ return iRunVipService.growCharge(apiGrowChargeDto);
+ }
+
@ApiOperation(value = "【购买VIP】APP支付", notes = "【购买VIP】APP支付")
@PostMapping(value = "/balanceBuy")
@SubmitRepeat
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowBuyDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowBuyDto.java
new file mode 100644
index 0000000..7ee1640
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowBuyDto.java
@@ -0,0 +1,25 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiGrowBuyDto", description = "API信息参数接收类")
+public class ApiGrowBuyDto {
+
+ @NotNull(message = "请输入下一个等级")
+ @ApiModelProperty(value = "下一个等级", example = "123456")
+ private String levelNext;
+
+ @ApiModelProperty(value = "支付金额", example = "123456")
+ private BigDecimal amount;
+
+ @NotNull(message = "请输入资金密码")
+ @ApiModelProperty(value = "资金密码", example = "123456")
+ private String tradeWord;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowChargeDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowChargeDto.java
new file mode 100644
index 0000000..f951839
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiGrowChargeDto.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiGrowChargeDto", description = "API信息参数接收类")
+public class ApiGrowChargeDto {
+
+ @NotNull(message = "请输入下一个等级")
+ @ApiModelProperty(value = "下一个等级", example = "123456")
+ private String levelNext;
+
+ @ApiModelProperty(value = "支付金额", example = "123456")
+ private BigDecimal amount;
+
+ @NotNull(message = "请输入资金密码")
+ @ApiModelProperty(value = "资金密码", example = "123456")
+ private String tradeWord;
+
+ @NotNull(message = "请选择地址")
+ @ApiModelProperty(value = "地址ID", example = "123456")
+ private Long addressId;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/RunVipGrow.java b/src/main/java/cc/mrbird/febs/mall/entity/RunVipGrow.java
new file mode 100644
index 0000000..2aa40a0
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/entity/RunVipGrow.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.mall.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ `member_id` bigint(20) DEFAULT NULL,
+ `level_now` varchar(100) DEFAULT NULL COMMENT '当前等级',
+ `level_next` varchar(100) DEFAULT NULL COMMENT '下一个级别',
+ `amount` decimal(20,2) DEFAULT NULL COMMENT '本次升级金额',
+ `amount_all` decimal(20,2) DEFAULT NULL COMMENT '升级下一个等级需要总金额',
+ `amount_now` decimal(20,2) DEFAULT NULL COMMENT '当前已投入升级的金额',
+ */
+@Data
+@TableName("run_vip_grow")
+public class RunVipGrow extends BaseEntity {
+
+ private Long memberId;
+ private String levelNow;
+ private String levelNext;
+ private BigDecimal amount;
+ private BigDecimal amountAll;
+ private BigDecimal amountNow;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/RunVipGrowMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/RunVipGrowMapper.java
new file mode 100644
index 0000000..61bccaf
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/RunVipGrowMapper.java
@@ -0,0 +1,7 @@
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.RunVipGrow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface RunVipGrowMapper extends BaseMapper<RunVipGrow> {
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IRunVipService.java b/src/main/java/cc/mrbird/febs/mall/service/IRunVipService.java
index 28ef69a..fa2ae09 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IRunVipService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IRunVipService.java
@@ -24,4 +24,10 @@
ApiRunDataVo runData();
ApiRunHealthVo runHealth();
+
+ FebsResponse growInfo();
+
+ FebsResponse growBuy(ApiGrowBuyDto apiGrowBuyDto);
+
+ FebsResponse growCharge(ApiGrowChargeDto apiGrowChargeDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index af1c944..81ac8aa 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -297,6 +297,7 @@
mallMemberVo.setWithdrawState(runVip.getWithdrawState());
mallMemberVo.setInsideState(runVip.getInsideState());
mallMemberVo.setCommissionState(runVip.getCommissionState());
+ mallMemberVo.setGrowState(runVip.getGrowState());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
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 635c78d..9912a03 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
@@ -30,8 +30,10 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -52,6 +54,7 @@
private final MallMemberMapper mallMemberMapper;
private final IApiMallMemberWalletService walletService;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final RunVipGrowMapper runVipGrowMapper;
@Override
public List<ApiRunVipVo> vipInfo() {
Long memberId = LoginUserUtil.getLoginUser().getId();
@@ -86,12 +89,26 @@
throw new FebsException("资金密码错误");
}
Long runVipId = apiGoChargeDto.getRunVipId();
- RunVip runVip = this.baseMapper.selectById(runVipId);
- if(runVip.getState() != YesOrNoEnum.YES.getValue()){
+ RunVip runVipNext = this.baseMapper.selectById(runVipId);
+ if(runVipNext.getState() != YesOrNoEnum.YES.getValue()){
throw new FebsException("会员套餐已下架");
}
//价格
- BigDecimal presentAmount = runVip.getPresentPrice().multiply(new BigDecimal(apiGoChargeDto.getVipCnt())).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal presentAmount = runVipNext.getPresentPrice().multiply(new BigDecimal(apiGoChargeDto.getVipCnt())).setScale(2,BigDecimal.ROUND_DOWN);
+ //减免价格
+ RunVip runVip = this.baseMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, mallMember.getLevel()));
+ BigDecimal reduceAmount = runVip.getPresentPrice();
+ RunVipGrow runVipGrow = runVipGrowMapper.selectList(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, memberId)
+ .eq(RunVipGrow::getLevelNow, mallMember.getLevel())
+ .orderByDesc(RunVipGrow::getId)
+ ).stream().findFirst().orElse(null);
+ if(runVipGrow != null){
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ reduceAmount = reduceAmount.add(amountNow);
+ }
+ presentAmount = presentAmount.subtract(reduceAmount);
Long addressId = apiGoChargeDto.getAddressId();
MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectById(addressId);
@@ -131,8 +148,8 @@
mallCharge.setAmount(presentAmount);
mallCharge.setFailTime(failTime);
mallCharge.setSysAddress(sysAddress);
- mallCharge.setVipCode(runVip.getVipCode());
- mallCharge.setVipName(runVip.getVipName());
+ mallCharge.setVipCode(runVipNext.getVipCode());
+ mallCharge.setVipName(runVipNext.getVipName());
mallCharge.setVipCnt(apiGoChargeDto.getVipCnt());
mallChargeMapper.insert(mallCharge);
@@ -156,6 +173,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public FebsResponse balanceBuy(ApiBalanceBuyDto apiBalanceBuyDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = mallMemberMapper.selectById(memberId);
@@ -167,12 +185,28 @@
throw new FebsException("资金密码错误");
}
Long runVipId = apiBalanceBuyDto.getRunVipId();
- RunVip runVip = this.baseMapper.selectById(runVipId);
- if(runVip.getState() != YesOrNoEnum.YES.getValue()){
+ RunVip runVipNext = this.baseMapper.selectById(runVipId);
+ if(runVipNext.getState() != YesOrNoEnum.YES.getValue()){
throw new FebsException("会员套餐已下架");
}
+
//价格
- BigDecimal presentAmount = runVip.getPresentPrice().setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal presentAmount = runVipNext.getPresentPrice().setScale(2,BigDecimal.ROUND_DOWN);
+ //减免价格
+ RunVip runVip = this.baseMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, mallMember.getLevel()));
+ BigDecimal reduceAmount = runVip.getPresentPrice();
+ RunVipGrow runVipGrow = runVipGrowMapper.selectList(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, memberId)
+ .eq(RunVipGrow::getLevelNow, mallMember.getLevel())
+ .orderByDesc(RunVipGrow::getId)
+ ).stream().findFirst().orElse(null);
+ if(runVipGrow != null){
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ reduceAmount = reduceAmount.add(amountNow);
+ }
+ presentAmount = presentAmount.subtract(reduceAmount);
+
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
if(mallMemberWallet.getCommission().compareTo(BigDecimal.ZERO) <= 0){
throw new FebsException("余额不足");
@@ -189,7 +223,7 @@
orderNo,
FlowTypeEnum.COMMISSION.getValue(),
RunVipMoneyFlowTypeEnum.COMMISSION_PAY.getValue(),
- presentAmount,
+ presentAmount.negate(),
StrUtil.format(RunVipMoneyFlowTypeEnum.COMMISSION_PAY.getDescription(),presentAmount),
YesOrNoEnum.YES.getValue()
);
@@ -201,8 +235,8 @@
mallCharge.setType(StrUtil.format(RunVipMoneyFlowTypeEnum.COMMISSION_PAY.getDescription(),presentAmount));
mallCharge.setAddress(mallMember.getPhone());
mallCharge.setAmount(presentAmount);
- mallCharge.setVipCode(runVip.getVipCode());
- mallCharge.setVipName(runVip.getVipName());
+ mallCharge.setVipCode(runVipNext.getVipCode());
+ mallCharge.setVipName(runVipNext.getVipName());
mallCharge.setVipCnt(apiBalanceBuyDto.getVipCnt());
mallChargeMapper.insert(mallCharge);
@@ -384,4 +418,254 @@
}
return apiRunHealthVo;
}
+
+ @Override
+ public FebsResponse growInfo() {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ ApiGrowInfoVo apiGrowInfoVo = new ApiGrowInfoVo();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ String memberLevel = mallMember.getLevel();
+
+ RunVipGrow runVipGrow = runVipGrowMapper.selectOne(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, memberId)
+ .orderByDesc(RunVipGrow::getId)
+ .last("limit 1")
+ );
+
+ //有升级权益的记录、当前等级和最新的升级记录是同一个
+ if(runVipGrow != null && memberLevel.equals(runVipGrow.getLevelNow())){
+ apiGrowInfoVo.setLevelNow(runVipGrow.getLevelNow());
+ apiGrowInfoVo.setAmountNow(runVipGrow.getAmountNow());
+ apiGrowInfoVo.setLevelNext(runVipGrow.getLevelNext());
+ apiGrowInfoVo.setAmountAll(runVipGrow.getAmountAll());
+ }else{
+ List<RunVip> runVips = this.baseMapper.selectList(null);
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
+ RunVip runVipNow = runVipMap.get(memberLevel);
+ apiGrowInfoVo.setLevelNow(runVipNow.getVipCode());
+ apiGrowInfoVo.setAmountNow(runVipNow.getPresentPrice());
+
+ //获取runVips中的orderNumber为runVipNow.getOrderNumber() + 1的那个元素
+ RunVip runVipNext = runVips.stream().filter(runVip -> runVip.getOrderNumber() == runVipNow.getOrderNumber() + 1).findFirst().orElse(null);
+ if(runVipNext != null){
+ apiGrowInfoVo.setLevelNext(runVipNext.getVipCode());
+ apiGrowInfoVo.setAmountAll(runVipNext.getPresentPrice());
+ }
+ }
+ return new FebsResponse().success().data(apiGrowInfoVo);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse growBuy(ApiGrowBuyDto apiGrowBuyDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ BigDecimal amount = apiGrowBuyDto.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ throw new FebsException("金额异常");
+ }
+
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("未设置资金密码");
+ }
+
+ if (!mallMember.getTradePassword().equals(SecureUtil.md5(apiGrowBuyDto.getTradeWord()))) {
+ throw new FebsException("资金密码错误");
+ }
+
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ if(mallMemberWallet.getCommission().compareTo(amount) < 0){
+ throw new FebsException("余额不足");
+ }
+
+ String memberLevel = mallMember.getLevel();
+ String levelNext = apiGrowBuyDto.getLevelNext();
+
+ List<RunVip> runVips = this.baseMapper.selectList(null);
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
+ RunVip runVip = runVipMap.get(memberLevel);
+ RunVip runVipNext = runVipMap.get(levelNext);
+ if(runVipNext == null){
+ throw new FebsException("无法升级会员权益");
+ }
+ if(runVip.getOrderNumber() < runVipNext.getOrderNumber()){
+ throw new FebsException("用户无法升级");
+ }
+
+ walletService.reduceCommission(amount,memberId);
+ String orderNo = MallUtils.getOrderNum("QY");
+ mallMoneyFlowService.runVipMoneyFlowAdd(
+ memberId,
+ memberId,
+ orderNo,
+ FlowTypeEnum.COMMISSION.getValue(),
+ RunVipMoneyFlowTypeEnum.COMMISSION_PAY_GROW.getValue(),
+ amount.negate(),
+ StrUtil.format(RunVipMoneyFlowTypeEnum.COMMISSION_PAY_GROW.getDescription(),amount),
+ YesOrNoEnum.YES.getValue()
+ );
+
+ RunVipGrow runVipGrow = runVipGrowMapper.selectOne(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, memberId)
+ .eq(RunVipGrow::getLevelNow, memberLevel)
+ .eq(RunVipGrow::getLevelNext, levelNext)
+ );
+
+ MallCharge mallCharge = new MallCharge();
+ mallCharge.setMemberId(memberId);
+ mallCharge.setOrderNo(orderNo);
+ mallCharge.setState(YesOrNoEnum.YES.getValue());
+ mallCharge.setType(StrUtil.format(RunVipMoneyFlowTypeEnum.COMMISSION_PAY_GROW.getDescription(),amount));
+ mallCharge.setAddress(mallMember.getPhone());
+ mallCharge.setAmount(amount);
+ mallCharge.setVipCnt(1);
+ mallCharge.setVipName(runVip.getVipName()+"权益");
+ mallCharge.setVipCode(runVip.getVipCode());
+ //有升级权益的记录
+ if(runVipGrow != null){
+ //判断金额是否满足升级条件
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ BigDecimal amountAll = runVipGrow.getAmountAll();
+ BigDecimal subtract = amountAll.subtract(amountNow);
+
+ if(subtract.compareTo(amount) <= 0){
+ runVipGrow.setAmountNow(amountAll);
+
+ mallCharge.setVipCode(runVipGrow.getLevelNext());
+ }else{
+ runVipGrow.setAmountNow(amountNow.add(amount).setScale(2, RoundingMode.DOWN));
+
+ mallCharge.setVipCode(memberLevel);
+ }
+ runVipGrow.setAmount(amount);
+ runVipGrowMapper.updateById(runVipGrow);
+ }else{
+ runVipGrow = new RunVipGrow();
+ runVipGrow.setMemberId(memberId);
+ runVipGrow.setLevelNow(memberLevel);
+ runVipGrow.setLevelNext(runVipNext.getVipCode());
+ runVipGrow.setAmountAll(runVipNext.getPresentPrice());
+ runVipGrow.setAmount(amount);
+ runVipGrow.setAmountNow(amount);
+ runVipGrowMapper.insert(runVipGrow);
+
+ if(runVipGrow.getAmountAll().compareTo(amount) <= 0){
+ mallCharge.setVipCode(runVipGrow.getLevelNext());
+ }
+ }
+ mallChargeMapper.insert(mallCharge);
+
+ agentProducer.sendBuyVipSuccessMsg(mallCharge.getId());
+
+ return new FebsResponse().success().data("操作成功");
+ }
+
+ @Override
+ public FebsResponse growCharge(ApiGrowChargeDto apiGrowChargeDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ BigDecimal amount = apiGrowChargeDto.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ throw new FebsException("金额异常");
+ }
+
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("未设置资金密码");
+ }
+
+ if (!mallMember.getTradePassword().equals(SecureUtil.md5(apiGrowChargeDto.getTradeWord()))) {
+ throw new FebsException("资金密码错误");
+ }
+
+ String memberLevel = mallMember.getLevel();
+ String levelNext = apiGrowChargeDto.getLevelNext();
+
+ List<RunVip> runVips = this.baseMapper.selectList(null);
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
+ RunVip runVip = runVipMap.get(memberLevel);
+ RunVip runVipNext = runVipMap.get(levelNext);
+ if(runVipNext == null){
+ throw new FebsException("无法升级会员权益");
+ }
+ if(runVip.getOrderNumber() < runVipNext.getOrderNumber()){
+ throw new FebsException("用户无法升级");
+ }
+
+ Long addressId = apiGrowChargeDto.getAddressId();
+ MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectById(addressId);
+ if(ObjectUtil.isEmpty(mallMemberPayment)){
+ return new FebsResponse().fail().message("请先绑定你的地址");
+ }
+
+ //判断系统的充值地址
+ String trcType = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.CHARGE_TYPE_TRC.getType(),
+ RunVipDataDictionaryEnum.CHARGE_TYPE_TRC.getCode()
+ ).getValue();
+ String sysAddress = "";
+ if(trcType.equals(mallMemberPayment.getBankNo())){
+ sysAddress = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.CHARGE_SYS_ADDRESS_TRC.getType(),
+ RunVipDataDictionaryEnum.CHARGE_SYS_ADDRESS_TRC.getCode()
+ ).getValue();
+ }else{
+ sysAddress = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.CHARGE_SYS_ADDRESS_BSC.getType(),
+ RunVipDataDictionaryEnum.CHARGE_SYS_ADDRESS_BSC.getCode()
+ ).getValue();
+ }
+ String failMinutes = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.CHARGE_SYS_FAIL_TIME.getType(),
+ RunVipDataDictionaryEnum.CHARGE_SYS_FAIL_TIME.getCode()
+ ).getValue();
+ DateTime failTime = DateUtil.offsetMinute(DateUtil.date(), Integer.parseInt(failMinutes));
+
+ MallCharge mallCharge = new MallCharge();
+ String orderNo = MallUtils.getOrderNum("QY");
+ mallCharge.setMemberId(memberId);
+ mallCharge.setOrderNo(orderNo);
+ mallCharge.setState(YesOrNoEnum.ING.getValue());
+ mallCharge.setType(mallMemberPayment.getBankNo());
+ mallCharge.setAddress(mallMemberPayment.getBank());
+ mallCharge.setFailTime(failTime);
+ mallCharge.setSysAddress(sysAddress);
+
+ mallCharge.setAmount(amount);
+ mallCharge.setVipCnt(1);
+ mallCharge.setVipName(runVip.getVipName()+"权益");
+ mallCharge.setVipCode(runVip.getVipCode());
+
+ RunVipGrow runVipGrow = runVipGrowMapper.selectOne(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, memberId)
+ .eq(RunVipGrow::getLevelNow, memberLevel)
+ .eq(RunVipGrow::getLevelNext, levelNext)
+ );
+
+ //有升级权益的记录、当前等级和最新的升级记录是同一个
+ if(runVipGrow != null){
+ //判断金额是否满足升级条件
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ BigDecimal amountAll = runVipGrow.getAmountAll();
+ BigDecimal subtract = amountAll.subtract(amountNow);
+
+ if(subtract.compareTo(amount) <= 0){
+ mallCharge.setVipCode(runVipGrow.getLevelNext());
+ }
+ }else{
+ if(runVipGrow.getAmountAll().compareTo(amount) <= 0){
+ mallCharge.setVipCode(runVipGrow.getLevelNext());
+ }
+ }
+
+ mallChargeMapper.insert(mallCharge);
+ return new FebsResponse().success().data("操作成功");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiGrowInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiGrowInfoVo.java
new file mode 100644
index 0000000..af9e25e
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiGrowInfoVo.java
@@ -0,0 +1,21 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiGoChargeVo", description = "基础数据")
+public class ApiGrowInfoVo {
+
+ @ApiModelProperty(value = "当前等级")
+ private String levelNow;
+ @ApiModelProperty(value = "当前已投入升级的金额")
+ private BigDecimal amountNow = BigDecimal.ZERO;
+ @ApiModelProperty(value = "下一个等级")
+ private String levelNext;
+ @ApiModelProperty(value = "升级下一个等级需要总金额")
+ private BigDecimal amountAll = BigDecimal.ZERO;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 18c9434..20ae176 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -42,6 +42,9 @@
@ApiModelProperty(value = "是否允许USDT提现 1是0否")
private Integer commissionState;//是否允许USDT提现 1是0否
+ @ApiModelProperty(value = "是否允许权益升级 1-是0-否")
+ private Integer growState;//是否允许权益升级 1-是0-否
+
@ApiModelProperty(value = "碳币")
private BigDecimal balance = BigDecimal.ZERO;
@ApiModelProperty(value = "碳积分")
--
Gitblit v1.9.1