From 495c3565a6816decff38d85c61a9d46ca3dddad7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:26:03 +0800
Subject: [PATCH] refactor(mall): 修改 API接口文档和枚举类型描述
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 0324149..53aaaf0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -60,6 +60,7 @@
private final AsyncService asyncService;
private final FebsConfigure febsConfigure;
+ private final RunVipGrowMapper runVipGrowMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -624,7 +625,11 @@
BigDecimal V3 = BigDecimal.ZERO;
if (flag) {
V2 = V1.divide(new BigDecimal("2"), 0, RoundingMode.DOWN);
- V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() <= V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }
}else{
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
new LambdaQueryWrapper<MallMoneyFlow>()
@@ -641,7 +646,39 @@
}else{
V2 = V1.multiply(new BigDecimal("2")).setScale(0,RoundingMode.DOWN);
}
- V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ if(V1.intValue() < V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue())).setScale(0,RoundingMode.DOWN);
+ }else if(V1.intValue() == V2.intValue()){
+ V3 = new BigDecimal(RandomUtil.randomInt(V1.intValue(),V2.intValue()+1)).setScale(0,RoundingMode.DOWN);
+ }else{
+ V3 = new BigDecimal(RandomUtil.randomInt(V2.intValue(),V1.intValue())).setScale(0,RoundingMode.DOWN);
+ }
+ }
+ //会员权益的收益
+ RunVipGrow runVipGrow = runVipGrowMapper.selectList(
+ new LambdaQueryWrapper<RunVipGrow>()
+ .eq(RunVipGrow::getMemberId, item.getId())
+ .eq(RunVipGrow::getLevelNow, runVip.getVipCode())
+ .orderByDesc(RunVipGrow::getId)
+ ).stream().findFirst().orElse(null);
+ if(null != runVipGrow){
+ BigDecimal amountNow = runVipGrow.getAmountNow();
+ RunVip runVipNext = runVips.stream().filter(vipItem -> vipItem.getOrderNumber() == runVip.getOrderNumber() + 1).findFirst().orElse(null);
+ if(runVipNext != null){
+ BigDecimal presentPrice = runVip.getPresentPrice();
+ BigDecimal presentPriceNext = runVipNext.getPresentPrice();
+ BigDecimal subtract = presentPriceNext.subtract(presentPrice);
+
+ BigDecimal divide = amountNow.divide(subtract, 4, RoundingMode.DOWN);
+
+ Integer growthCnt = runVip.getGrowthCnt();
+ Integer growthCntNext = runVipNext.getGrowthCnt();
+ int growthNum = growthCntNext - growthCnt;
+
+ BigDecimal growthAmountTotal = divide.multiply(new BigDecimal(growthNum));
+ BigDecimal growthAmount = growthAmountTotal.divide(new BigDecimal(C1), 0, RoundingMode.DOWN);
+ V3 = V3.add(growthAmount);
+ }
}
//更新钱包数据
if(V3.intValue() <= 0){
--
Gitblit v1.9.1