From 87f19e956d33a924c16c9148467aedcdc7563ae7 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 23 Sep 2025 09:25:11 +0800 Subject: [PATCH] =?UTF-8?q?##=200=E5=85=83=E4=BB=A5=E5=8F=8A188=E4=B8=8D?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E4=B8=9A=E7=BB=A9=E5=86=99=E5=8F=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BonusSettleFirstPurchaseHandle.java | 12 ++++++------ .../service/impl/BonusSettleNewExpandHandle.java | 6 +++--- .../service/impl/BonusSettlePurchaseHandle.java | 10 +++++----- .../bonus/service/impl/BonusSettleServiceImpl.java | 4 ++-- 4 files changed, 16 insertions(+), 16 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 76157c82..7be5b64d 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() - || !SysConstants.NOT_BONUS_GRADE.contains(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() - || !SysConstants.NOT_BONUS_GRADE.contains(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() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -438,7 +438,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -603,7 +603,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { pkMember = targetMemberSettleExt.getPkParent(); if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员状态不正常 或者 停算收益 或 顾客等级 直接跳过 continue; } @@ -811,7 +811,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() || ERegistrationAuthority.SERVICE.getValue() != targetMemberSettleExt.getRegisterAuthority() - || !SysConstants.NOT_BONUS_GRADE.contains(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 ea4efe45..8dd2d20a 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() - || !SysConstants.NOT_BONUS_GRADE.contains(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() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -189,7 +189,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { if (targetMemberSettleExt == null || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(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 71dca68b..c484ab0f 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 @@ -60,7 +60,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { // 死点 停算 顾客 没有奖金 if (ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 pkParent = targetMemberSettleExt.getPkParent(); continue; @@ -235,7 +235,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -265,7 +265,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; } @@ -301,7 +301,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(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() - || !SysConstants.NOT_BONUS_GRADE.contains(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 0ab43300..c1e54406 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 @@ -206,7 +206,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算条件，跳过 continue; } @@ -315,7 +315,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { if (null == targetMemberSettleExt || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory() || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus() - || !SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { + || SysConstants.NOT_BONUS_GRADE.contains(targetMemberSettleExt.getGradeValue())) { // 会员不满足计算奖金条件，跳过 continue; }