angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 乐学V1复购价格改为2980，乐学复购300级差减少一级；

This commit is contained in:
cabbage 2025-04-28 11:40:32 +08:00
parent 2cec5a8f7a
commit 93dce94302
6 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -540,13 +540,14 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
BigDecimal maxBonus;
if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V1)) {
// 价格大于等于3280，最多拨900
maxBonus = BigDecimal.valueOf(900);
// 2025.04.28 需求调整去掉 V1 等级，最低为2980，最多拨600
maxBonus = MagicNumberConstants.LXYK_BONUS_600;
} else if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V2)) {
// 价格大于等于2980，最多拨600
maxBonus = BigDecimal.valueOf(600);
maxBonus = MagicNumberConstants.LXYK_BONUS_600;
} else if (ComputeUtil.compareValue(saOrderItems.getPrice(), MagicNumberConstants.LXYK_V3)) {
// 价格大于等于2680，最多拨拨300
maxBonus = BigDecimal.valueOf(300);
maxBonus = MagicNumberConstants.LXYK_BONUS_300;
} else {
maxBonus = BigDecimal.ZERO;
}
@ -563,9 +564,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
break;
}
int pkGrade = sourceMemberTree.getPkGrade();
if (pkGrade == 3) {
if (pkGrade == 3 || pkGrade == 4) {
// 如果是 V1 直接跳过，开始计算 V2
pkGrade = 4;
// 2025.04.28 需求调整去掉 V1 等级，V1 V2 就直接跳过，开始计算V3
pkGrade = 5;
}
// 推荐人
CuMemberSettleExt parentMemberTree = cuMemberSettleExtMap.get(sourceMemberTree.getPkParent());
@ -576,16 +578,20 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
}
// 级差奖金
BigDecimal rangeOrder = BigDecimal.ZERO;
if (parentMemberTree.getPkGrade() == 4) {
// V2 拿 300
rangeOrder = BigDecimal.valueOf(300);
} else if (parentMemberTree.getPkGrade() == 5) {
// if (parentMemberTree.getPkGrade() == 4) {
// // V2 拿 300
// // 2025.04.28 需求调整去掉 V1 等级，V2 不需要拿了
// rangeOrder = MagicNumberConstants.LXYK_BONUS_300;
// } else
if (parentMemberTree.getPkGrade() == 5) {
// V3前没有V2，拿600； V3前有V2，拿300
if (ComputeUtil.computeSubtract(maxBonus, grantBonus).compareTo(new BigDecimal(900)) == 0) {
rangeOrder = BigDecimal.valueOf(600);
} else {
rangeOrder = BigDecimal.valueOf(300);
}
// 2025.04.28 需求调整去掉 V1 等级，V3 拿300
rangeOrder = MagicNumberConstants.LXYK_BONUS_300;
// if (ComputeUtil.computeSubtract(maxBonus, grantBonus).compareTo(new BigDecimal(900)) == 0) {
// rangeOrder = MagicNumberConstants.LXYK_BONUS_600;
// } else {
// rangeOrder = MagicNumberConstants.LXYK_BONUS_300;
// }
} else if (parentMemberTree.getPkGrade() == 6) {
// V4 拿剩下所有
rangeOrder = ComputeUtil.computeSubtract(maxBonus, grantBonus);

8
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java
View File

@ -281,17 +281,17 @@ public class SaOrderHandle {
&& EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) {
// 乐学复购，价格根据等级固定
if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) {
if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
saOrderItems.setPrice(MagicNumberConstants.LXYK_V4);
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) {
saOrderItems.setPrice(MagicNumberConstants.LXYK_V3);
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) {
saOrderItems.setPrice(MagicNumberConstants.LXYK_V2);
} else {
saOrderItems.setPrice(MagicNumberConstants.LXYK_V1);
}
// TODO new 乐学复购商品业绩为600
saOrderItems.setAchievement(BigDecimal.valueOf(600));
saOrderItems.setAchievement(MagicNumberConstants.LXYK_PV);
}
// 免邮的话不需要计算邮费

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java
View File

@ -245,11 +245,11 @@ public class ApiBdWaresController extends BaseController {
}
if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea()) {
// 乐学复购，价格根据等级固定
if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) {
if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V4;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V3;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V2;
} else {
waresPrice = MagicNumberConstants.LXYK_V1;

18
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
View File

@ -195,11 +195,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
BigDecimal price;
// 乐学复购，价格根据等级固定
if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) {
if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V4;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V3;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V2;
} else {
price = MagicNumberConstants.LXYK_V1;
@ -364,11 +364,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
Map<Integer, GradeDTO> gradeMap = gradeServiceApi.queryGradeList(pkCountry).getData().stream()
.collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity()));
BigDecimal price;
if (cuMember.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) {
if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V4;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V3;
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) {
} else if (cuMember.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) {
price = MagicNumberConstants.LXYK_V2;
} else {
price = MagicNumberConstants.LXYK_V1;
@ -569,11 +569,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
// 价格
BigDecimal waresPrice;
if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(70).getPkId())) {
if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(EGrade.S_VIP.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V4;
} else if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(60).getPkId())) {
} else if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(EGrade.VIP.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V3;
} else if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(50).getPkId())) {
} else if (cuMemberDate.getPkSettleGrade().equals(gradeMap.get(EGrade.MAKER.getValue()).getPkId())) {
waresPrice = MagicNumberConstants.LXYK_V2;
} else {
waresPrice = MagicNumberConstants.LXYK_V1;

15
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java
View File

@ -114,7 +114,20 @@ public class MagicNumberConstants {
/**
* 乐学复购 V1 价格
*/
public static final BigDecimal LXYK_V1 = new BigDecimal("3280");
public static final BigDecimal LXYK_V1 = new BigDecimal("2980");
/**
* 乐学复购业绩
*/
public static final BigDecimal LXYK_PV = new BigDecimal("600");
/**
* 乐学复购级差奖金300
*/
public static final BigDecimal LXYK_BONUS_300 = new BigDecimal("300");
/**
* 乐学复购级差奖金600
*/
public static final BigDecimal LXYK_BONUS_600 = new BigDecimal("600");
/**

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java
View File

@ -6,11 +6,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 等级设置
* @Author: sui q
* @Time: 2022/8/30 10:45
* @Classname: EGrade
* @PackageName: com.hzs.common.core.enums
* 等级设置
*/
@AllArgsConstructor
@Getter