diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index fb556416..93445742 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -2101,7 +2101,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (SaOrderItemsExt saOrderItemsExt : saOrderItemsExtList) { // 级别值比当前等级高的级差数据列表 Map itemsRangePriceMap = saOrderItemsExt.getWaresRangeTmpList().stream() - .filter(tmpData -> tmpData.getRangeValue().compareTo(sourceMemberRangeExt.getGradeValue()) > 0) .collect(Collectors.toMap(WaresRangeTmp::getRangeValue, WaresRangeTmp::getRangePrice)); // 临时价格（跟着每一次变动） @@ -2127,7 +2126,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { continue; } // 当前会员等级值 - int calGradeValue = targetMemberRangeExt.getGradeValue(); + Integer calGradeValue = EAwards.getGradeValueByValue(targetMemberRangeExt.getGradeValue()); // 当前会员的级差价格 BigDecimal targetRangePrice = itemsRangePriceMap.get(calGradeValue); if (targetRangePrice.compareTo(tmpPrice) < 0) { @@ -2168,6 +2167,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrder(saOrderExt.getPkId()); + cuMemberBonusRange.setPkOrderItems(0L); rangeRepurchaseRetailRemark(saOrderExt, cuMemberBonusRange, sourceMemberRangeExt, targetMemberRangeExt); BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate()); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusRange.getIncomeStatus()) { diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 90d250af..1b573a8d 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -344,7 +344,7 @@ - select soi.pk_order, soi.pk_id, soi.price, diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index ccbb926b..b3f9921c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -214,7 +214,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EAwards value : EAwards.values()) { if (value.getEnable() == EYesNo.YES.getIntValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.AWARDS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -228,7 +228,7 @@ public class EnumsController extends BaseController { List enumEntityList = new ArrayList<>(); for (EAwardsLevel value : EAwardsLevel.values()) { if (value.getEnable() == EYesNo.YES.getIntValue()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.AWARDS_LEVEL)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index d2a77a14..af2a8b73 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -90,11 +90,7 @@ public class EnumsInitController { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 奖衔枚举枚举 - for (EAwards value : EAwards.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - // 等级枚举枚举 + // 等级枚举枚举 for (EGrade value : EGrade.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java index d0236a0f..788df2e6 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java @@ -1,6 +1,5 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; @@ -14,77 +13,73 @@ public enum EAwards { /** * -1=海粉 */ - SEA_FLOUR(0, -1, "海粉", 1, EnumsPrefixConstants.AWARDS + "-1"), - + SEA_FLOUR(0, -1, "海粉", 1), /** * 0=无 */ - MEMBER(1, 0, "无", 0, EnumsPrefixConstants.AWARDS + 0), + MEMBER(1, 0, "无", 0), /** * 黄宝 */ - HEADER(2, 5, "一级", 0, EnumsPrefixConstants.AWARDS + 5), + HEADER(2, 5, "一级", 0), /** * 绿宝 */ - MANAGER(3, 10, "二级", 0, EnumsPrefixConstants.AWARDS + 10), + MANAGER(3, 10, "二级", 0), /** * 蓝宝 */ - HIGH_MANAGER(4, 15, "三级", 0, EnumsPrefixConstants.AWARDS + 15), - + HIGH_MANAGER(4, 15, "三级", 0), /** * 钻石 */ - SENIOR_MANAGER(5, 20, "四级", 0, EnumsPrefixConstants.AWARDS + 20), + SENIOR_MANAGER(5, 20, "四级", 0), /** * 黄钻 */ - CHIEF(6, 25, "五级", 0, EnumsPrefixConstants.AWARDS + 25), + CHIEF(6, 25, "五级", 0), /** * 绿钻 */ - HIGH_CHIEF(7, 30, "六级", 0, EnumsPrefixConstants.AWARDS + 30), - + HIGH_CHIEF(7, 30, "六级", 0), /** * 星耀蓝钻 */ - SENIOR_CHIEF(8, 35, "七级", 0, EnumsPrefixConstants.AWARDS + 35), + SENIOR_CHIEF(8, 35, "七级", 0), /** * 王者红钻 */ - CHAIRMAN(9, 40, "八级", 0, EnumsPrefixConstants.AWARDS + 40), + CHAIRMAN(9, 40, "八级", 0), /** * 传奇紫钻 */ - HONOR_CHAIRMAN(10, 45, "九级", 0, EnumsPrefixConstants.AWARDS + 45), - + HONOR_CHAIRMAN(10, 45, "九级", 0), /** * 10 */ - GLOBAL_CHAIRMAN(11, 50, "十级", 0, EnumsPrefixConstants.AWARDS + 50), + GLOBAL_CHAIRMAN(11, 50, "十级", 0), /** * 11 */ - LEVEL_ELEVEN(12, 55, "十一级", 0, EnumsPrefixConstants.AWARDS + 55), + LEVEL_ELEVEN(12, 55, "十一级", 0), /** * 12 */ - LEVEL_TWELVE(13, 60, "十二级", 0, EnumsPrefixConstants.AWARDS + 60), + LEVEL_TWELVE(13, 60, "十二级", 0), /** * 13 */ - LEVEL_THIRTEEN(14, 65, "十三级", 0, EnumsPrefixConstants.AWARDS + 65), + LEVEL_THIRTEEN(14, 65, "十三级", 0), /** * 14 */ - LEVEL_FOURTEEN(15, 70, "十四级", 0, EnumsPrefixConstants.AWARDS + 70), + LEVEL_FOURTEEN(15, 70, "十四级", 0), /** * 15 */ - LEVEL_FIFTEEN(16, 75, "十五级", 0, EnumsPrefixConstants.AWARDS + 75), + LEVEL_FIFTEEN(16, 75, "十五级", 0), ; @@ -105,17 +100,29 @@ public enum EAwards { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - public static String getAwardsLabel(int value) { - for (EAwards eAwards : EAwards.values()) { - if (eAwards.value == value) { - return eAwards.label; - } + /** + * 根据枚举值获取等级枚举值（用于级差枚举值转换） + * + * @param value + * @return + */ + public static Integer getGradeValueByValue(int value) { + if (EGrade.START_UP.getValue() == value) { + return EAwards.MEMBER.getValue(); + } else if (EGrade.HAI_FAN.getValue() == value) { + return EAwards.HEADER.getValue(); + } else if (EGrade.YOU_KE.getValue() == value) { + return EAwards.MANAGER.getValue(); + } else if (EGrade.MAKER.getValue() == value) { + return EAwards.HIGH_MANAGER.getValue(); + } else if (EGrade.VIP.getValue() == value) { + return EAwards.SENIOR_MANAGER.getValue(); + } else if (EGrade.S_VIP.getValue() == value) { + return EAwards.CHIEF.getValue(); } - return ""; + return 0; } + + }