From 625b6eb2e6cde5c102005e86cc3265eaf7f90f30 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 15 Sep 2025 17:16:29 +0800 Subject: [PATCH] =?UTF-8?q?##=200=E5=85=83=E4=BC=9A=E5=91=98=E4=B8=8D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=A5=96=E9=87=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettleFirstPurchaseHandle.java | 13 ++-- .../impl/BonusSettleNewExpandHandle.java | 7 +-- .../impl/BonusSettlePurchaseHandle.java | 62 +++++++++---------- .../service/impl/BonusSettleServiceImpl.java | 7 +-- .../common/core/constant/SysConstants.java | 10 +++ 5 files changed, 53 insertions(+), 46 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index d6ec792f..76157c82 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -97,7 +97,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // 死点 或 停算收益 或 顾客 没有奖金 if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 return null; } @@ -349,7 +349,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -378,7 +378,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (targetMemberSettleExt == null || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -438,8 +438,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -604,7 +603,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { pkMember = targetMemberSettleExt.getPkParent(); if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员状态不正常 或者 停算收益 或 顾客等级 直接跳过 continue; } @@ -812,7 +811,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || ERegistrationAuthority.SERVICE.getValue() != targetMemberSettleExt.getRegisterAuthority() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 非正常会员、停算收益、不是服务中心，都不进行处理 return null; } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java index 8c0d1711..ea4efe45 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java @@ -121,7 +121,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -151,7 +151,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { if (targetMemberSettleExt == null || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -189,8 +189,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { if (targetMemberSettleExt == null || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index 055febd7..71dca68b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.bonus.vo.BonusRecordDetailVO; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MagicNumberConstants; +import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.constant.msg.BonusMsgConstants; import com.hzs.common.core.enums.*; import com.hzs.common.core.utils.ComputeUtil; @@ -59,7 +60,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { // 死点 停算 顾客 没有奖金 if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 pkParent = targetMemberSettleExt.getPkParent(); continue; @@ -159,31 +160,31 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { return cuMemberBonusExpandList; } - /** - * 秒接复购量奖 - * - * @return: List - */ - protected List calculateRepurchaseExpandSecondBonus(Map riskControlMap, String settleTableName, Map cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, - Map systemConfigMap, Integer period, Map weekMemberBonusMap, - Map cuMemberBonusMap, SaOrderExt saOrderExt, - List cuMemberSettleExtList, String settleDateStr, BigDecimal addTouch, BigDecimal expandRatio, Integer expandNumber) { - // 复购订单，计算复购级差，复购拓展 - return calculateRepurchaseExpandBonusOne(riskControlMap, settleTableName, cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, - saOrderExt, cuMemberSettleExtList, addTouch, expandRatio, expandNumber); - } - - /** - * 秒接复购量奖 - * - * @return: List - */ - protected List calculateRepurchasePushSecondBonus(String settleTableName, Map cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, Integer period, - Map cuMemberBonusMap, SaOrderExt saOrderExt, - List cuMemberSettleExtList, String settleDateStr) { - // 根据订单获取轮次，要回写 - return calculateRepurchasePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, null, period, cuMemberBonusMap, saOrderExt); - } +// /** +// * 秒接复购量奖 +// * +// * @return: List +// */ +// protected List calculateRepurchaseExpandSecondBonus(Map riskControlMap, String settleTableName, Map cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, +// Map systemConfigMap, Integer period, Map weekMemberBonusMap, +// Map cuMemberBonusMap, SaOrderExt saOrderExt, +// List cuMemberSettleExtList, String settleDateStr, BigDecimal addTouch, BigDecimal expandRatio, Integer expandNumber) { +// // 复购订单，计算复购级差，复购拓展 +// return calculateRepurchaseExpandBonusOne(riskControlMap, settleTableName, cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, +// saOrderExt, cuMemberSettleExtList, addTouch, expandRatio, expandNumber); +// } +// +// /** +// * 秒接复购量奖 +// * +// * @return: List +// */ +// protected List calculateRepurchasePushSecondBonus(String settleTableName, Map cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, Integer period, +// Map cuMemberBonusMap, SaOrderExt saOrderExt, +// List cuMemberSettleExtList, String settleDateStr) { +// // 根据订单获取轮次，要回写 +// return calculateRepurchasePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, null, period, cuMemberBonusMap, saOrderExt); +// } /** * 计算复购量奖（拓展收益） @@ -234,7 +235,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -264,7 +265,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -300,8 +301,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -928,7 +928,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { BigDecimal beforeBonusCal) { if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 死点 停算 顾客 没有奖金，跳过 return null; } else { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 0742fb25..0ab43300 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -22,6 +22,7 @@ import com.hzs.bonus.swing.service.ICuMemberSwingNetLogService; import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.BonusFieldConstants; import com.hzs.common.core.constant.CountryConstants; +import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.enums.*; import com.hzs.common.core.utils.ComputeUtil; @@ -205,8 +206,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算条件，跳过 continue; } @@ -315,8 +315,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue() - || EGrade.HAI_FAN.getValue() == targetMemberSettleExt.getGradeValue()) { + || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 8b4a795f..bcc32f5e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -1,5 +1,10 @@ package com.hzs.common.core.constant; +import com.hzs.common.core.enums.EGrade; + +import java.util.Arrays; +import java.util.List; + /** * 系统使用常量 */ @@ -34,4 +39,9 @@ public class SysConstants { */ public static final Long PK_VERTEX_1440_TEST = 347L; + /** + * 不拿奖金的等级 + */ + public static final List NOT_BONUS_GRADE = Arrays.asList(EGrade.START_UP.getValue(), EGrade.HAI_FAN.getValue()); + }