From 4372dc51c738062be0a748ec2a6763e546798d8c Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 24 Jul 2025 14:37:31 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=A7=81=E7=82=B9=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A1=A5=E5=85=A8=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/bonus/bonus/service/impl/BonusSettleHandle.java | 2 +- .../bonus/service/impl/BonusSettlePurchaseHandle.java | 5 +++++ .../bonus/bonus/service/impl/BonusSettleServiceImpl.java | 1 + .../com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java | 8 +++++--- .../detail/service/impl/CuMemberAssessServiceImpl.java | 8 ++++---- .../mapper/member/achieve/CuMemberTreeMapper.xml | 4 ++-- .../mapper/member/detail/CuMemberAssessMapper.xml | 6 +++--- .../java/com/hzs/common/core/enums/EAssessmentType.java | 7 ++++++- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 0dd0254a..652d7a66 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -746,7 +746,7 @@ public abstract class BonusSettleHandle { protected void repurchasePointRemark(SaOrderExt saOrderExt, CuMemberBonusCoach cuMemberBonusCoach, CuMemberSettleExt sourceMemberRangeExt, CuMemberSettleExt targetMemberRangeExt, int algebra) { - String remark = String.format(BonusMsgConstants.REPURCHASE_POINT, algebra, 1, saOrderExt.getOrderCode(), + String remark = String.format(BonusMsgConstants.REPURCHASE_POINT, algebra, saOrderExt.getOrderCode(), sourceMemberRangeExt.getMemberCode() + sourceMemberRangeExt.getMemberName(), targetMemberRangeExt.getMemberCode() + targetMemberRangeExt.getMemberName(), cuMemberBonusCoach.getCalAchieve(), cuMemberBonusCoach.getCalValue()); 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 7e807924..8bfc03e0 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 @@ -789,6 +789,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { cuMemberBonusCoach.setCalAchieve(saOrderExt.getOrderAchieve()); cuMemberBonusCoach.setCalValue(pointRatio); cuMemberBonusCoach.setPretaxIncome(pretaxIncome); + cuMemberBonusCoach.setCurrentGeneration(pointAlgebra); repurchasePointRemark(saOrderExt, cuMemberBonusCoach, sourceMemberSettleExt, targetMemberSettleExt, pointAlgebra); // 奖金扣项 BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusCoach, @@ -837,6 +838,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { .incomeRatio(BigDecimal.ZERO) .incomeDialRatio(BigDecimal.ZERO) .orderDialRatio(BigDecimal.ZERO) + .coachNoCapping(BigDecimal.ZERO) + .coachCapping(BigDecimal.ZERO) + .coachNormalHalf(BigDecimal.ZERO) + .coachNormalReal(BigDecimal.ZERO) .build(); cuMemberBonusCoach.setPkCountry(cuMemberSettleExt.getPkSettleCountry()); cuMemberBonusCoach.setPkCreator(MagicNumberConstants.PK_ADMIN); 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 ec7d3ca2..40b6790b 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 @@ -1308,6 +1308,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { .repRangeIncome(BigDecimal.ZERO) .hiFunIncome(BigDecimal.ZERO) .haiFunIncome(BigDecimal.ZERO) + .globalPoints(BigDecimal.ZERO) .build(); memberBonusDetailVoMap.put(pkOrder, memberBonusDetailCalVO); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java index 37423210..6b5d908f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java @@ -204,13 +204,15 @@ public interface CuMemberAssessMapper extends BaseMapper { * 创建免考会员数据 * * @param accessTableName - * @param startDate + * @param monthStartDate * @param endDate + * @param startDate * @return */ int createPassMemberAssess(@Param("accessTableName") String accessTableName, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate); + @Param("monthStartDate") Date monthStartDate, + @Param("endDate") Date endDate, + @Param("startDate") Date startDate); /** * 处理考试通过会员 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java index 86b1b611..321db143 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java @@ -408,15 +408,15 @@ public class CuMemberAssessServiceImpl extends ServiceImpl diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml index 1671de46..d50413fd 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml @@ -469,7 +469,7 @@ from cu_member cm where cm.del_flag = 0 and cm.pay_status = 1 - and cm.pay_time >= #{startDate} + and cm.pay_time >= #{monthStartDate} and #{endDate} >= cm.pay_time ) tmp on (cma.pk_member = tmp.pk_id and assess_type = 0 and cma.del_flag = 0) @@ -483,7 +483,7 @@ start_date, end_date) values (tmp.pk_id, - 0, + 5, 0, 1, tmp.pk_id, @@ -522,7 +522,7 @@ pk_creator, start_date, end_date) - values (tmp.pk_member, 0, 1, 0, tmp.pk_member, tmp.pay_time, #{endDate}) + values (tmp.pk_member, 5, 1, 0, tmp.pk_member, trunc(tmp.pay_time), #{endDate}) diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java index ba7c90cd..136d60eb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessmentType.java @@ -11,7 +11,7 @@ import lombok.Getter; public enum EAssessmentType { /** - * 0=复购考核（见点收益考核） + * 0=复购考核 */ REPURCHASE_ASSESS(0, "复购考核", 0), @@ -25,6 +25,11 @@ public enum EAssessmentType { */ NO_ASSESSMENT(2, "不考核", 0), + /** + * 5=见点收益考核 + */ + POINT_ASSESS(5, "见点收益考核", 0), + ; /**