From cd8140a1f7de6ce800029ec20d1666d957011cbd Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 30 Jul 2025 15:08:01 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=80=83=E6=A0=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E5=91=98=E8=80=83=E6=A0=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettleFirstPurchaseHandle.java | 1 - .../impl/BonusSettlePurchaseHandle.java | 13 ---- .../service/impl/BonusSettleServiceImpl.java | 1 - .../detail/mapper/CuMemberAssessMapper.java | 2 +- .../impl/CuMemberAssessServiceImpl.java | 2 +- .../hzs/bonus/detail/vo/CuMemberAssessVO.java | 14 +--- .../bonus/achieve/CuMemberTreeMapper.xml | 2 +- .../bonus/detail/CuMemberAssessMapper.xml | 71 +++++++++++++------ .../detail/param/MemberAssessParam.java | 5 ++ .../member/detail/vo/CuMemberAssessVO.java | 5 -- .../hzs/member/detail/vo/MemberAssessVO.java | 11 +++ .../member/detail/CuMemberAssessMapper.xml | 3 + .../enums/controller/EnumsController.java | 2 +- .../hzs/common/core/enums/EAssessStatus.java | 13 ++-- .../core/enums/EMemberAssessStatus.java | 6 +- .../common/core/enums/ERepurchaseType.java | 7 -- .../common/core/web/domain/EnumEntity.java | 8 +-- .../domain/member/detail/CuMemberAssess.java | 12 ++++ 18 files changed, 92 insertions(+), 86 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 b3952962..acfef178 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 @@ -177,7 +177,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { // 直接计算奖金 业绩 * 计算值，判断是否有扣项 // 获取等级对应的业绩 BigDecimal orderAchieve = saOrderExt.getOrderAchieve(); - // TODO new 乐学处理直接使用订单业绩，不跟等级业绩走 // // 获得升级方式 // String value = systemConfigMap.get(targetMemberSettleExt.getPkSettleCountry() + ESystemConfig.UPGRADE_WAY.getKey()); // if (Objects.equals(Integer.toString(EUpgradeWay.COVER.getValue()), value) && CollectionUtil.isNotEmpty(gradeList)) { 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 fe3d66e0..8d614c28 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 @@ -69,17 +69,6 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { continue; } - // TODO new 乐学没有复购考核校验，改为校验月新增小区业绩 -// // 正常状态的辅导奖需要判断复购考核，复购考核不通过的状态变为烧伤 -// if (EYesNo.NO.getIntValue() == targetMemberSettleExt.getPurchaseStatus()) { -// // 需要复购考核的 -// CuMemberAssess cuMemberAssess = cuMemberAssessMap.get(targetMemberSettleExt.getPkMember()); -// if (cuMemberAssess == null) { -// pkParent = targetMemberSettleExt.getPkParent(); -// continue; -// } -// } - CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, saOrderExt, targetMemberSettleExt); // 直推奖金明细 int pkBonusItem = getPkBonusItems(bonusConfigDTO, targetMemberSettleExt.getPkSettleCountry(), EBonusItems.HELP_EACH_INCOME.getValue()); @@ -193,8 +182,6 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { Map cuMemberBonusMap, SaOrderExt saOrderExt, List cuMemberSettleExtList, String settleDateStr) { // 根据订单获取轮次，要回写 - // 乐学新制度没有没有复购考核了 -// Map cuMemberAssessMap = getCuMemberAssessMap(cuMemberSettleExtMap, settleDateStr, cuMemberSettleExtList); return calculateRepurchasePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, null, period, cuMemberBonusMap, saOrderExt); } 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 43b4ceb7..e9d2d7bd 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 @@ -468,7 +468,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { List mallOrderList = new ArrayList<>(); // 拓展收益订单 -- 2025.05.13 拓展收益比例改为1：2，首购+复购业绩合并计算 List expandOrderList = newExpandFlag ? new ArrayList<>() : null; - // 特殊订单，目前乐学易考 // 其他订单 注意，累计业绩已经在计算奖衔前累计完成，不需要在计算累计业绩，只需要计算新增跟结余过滤掉其他订单 saOrderExtList.forEach(saOrderExt -> { //根据订单状态回退网体,查询撤销订单, 撤销订单不进行结算 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 207ead5e..39d9de66 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 @@ -216,7 +216,7 @@ public interface CuMemberAssessMapper extends BaseMapper { @Param("startDate") Date startDate); /** - * 处理考试通过会员 + * 处理会员考核 * * @param accessTableName * @param 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 9ee83a16..390c2fd4 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 @@ -420,7 +420,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl * 会员信息-会员考核记录VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data -public class CuMemberAssessVO { +public class CuMemberAssessVO { private static final long serialVersionUID = 1L; @@ -62,8 +57,6 @@ public class CuMemberAssessVO { private String orderCode; - - /** * 交易时间 */ @@ -141,9 +134,4 @@ public class CuMemberAssessVO { List orderTypeList; - - - - - } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml index 7c73fba9..0413790c 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml @@ -1185,7 +1185,7 @@ from ${assessTableName} cma where cma.del_flag = 0 and cma.assess_type = 5 - and cma.assess_status in (1, 2)) tmp + and cma.assess_status in (0, 1)) tmp on (tmp.pk_member = cms.pk_member) when matched then update set cms.is_maker_space = 0 diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml index 0ae350af..c1027795 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml @@ -460,12 +460,19 @@ merge into ${accessTableName} cma using ( - select cm.pk_id + select cm.pk_id, + case + when cm.pay_time >= #{monthStartDate} and #{endDate} >= cm.pay_time then 0 + else 1 + end is_examine, + case + when cm.pay_time >= #{monthStartDate} and #{endDate} >= cm.pay_time then 1 + else 2 + end assess_status from cu_member cm where cm.del_flag = 0 + and cm.category = 0 and cm.pay_status = 1 - and cm.pay_time >= #{monthStartDate} - and #{endDate} >= cm.pay_time ) tmp on (cma.pk_member = tmp.pk_id and assess_type = 5 and cma.del_flag = 0) when not matched then @@ -479,35 +486,46 @@ end_date) values (tmp.pk_id, 5, - 0, - 1, + tmp.is_examine, + tmp.assess_status, tmp.pk_id, #{startDate}, #{endDate}) - + merge into ${accessTableName} cma - using (select tmp.pk_member, tmp.pay_time - from (select so.pk_member, min(so.pay_time) pay_time - from sa_order so - where so.del_flag = 0 - and so.order_type = 3 - and so.order_status = 1 - and so.order_achieve > 0 - and so.pay_time >= #{startDate} - and #{endDate} >= so.pay_time - group by so.pk_member) tmp + using (select tmp.pk_member, + tmp.pay_time, + case + when tmp.pay_time is null then 2 + else 0 + end assess_status + from (select cma.pk_member, tmp.pay_time + from ${accessTableName} cma + left join (select so.pk_member, min(so.pay_time) pay_time + from sa_order so + where so.del_flag = 0 + and so.order_type = 3 + and so.order_status = 1 + and so.order_achieve > 0 + and so.pay_time >= #{startDate} + and #{endDate} >= so.pay_time + group by so.pk_member) tmp + on tmp.pk_member = cma.pk_member + where cma.assess_type = 5 + and cma.is_examine = 1 + and cma.del_flag = 0) tmp left join ${accessTableName} cma on cma.pk_member = tmp.pk_member - and cma.assess_type = 0 - and cma.del_flag = 0 - where cma.start_date is null - or tmp.pay_time > cma.start_date) tmp - on (cma.pk_member = tmp.pk_member and assess_type = 5 and cma.del_flag = 0 and cma.is_examine = 1) + and cma.assess_type = 5 + and cma.is_examine = 1 + and cma.del_flag = 0) tmp + on (cma.pk_member = tmp.pk_member and assess_type = 5 and cma.is_examine = 1 and cma.del_flag = 0) when matched then - update set cma.start_date = tmp.pay_time + update set cma.assess_status = tmp.assess_status, + cma.start_date = tmp.pay_time when not matched then insert (pk_member, @@ -517,7 +535,14 @@ pk_creator, start_date, end_date) - values (tmp.pk_member, 5, 1, 0, tmp.pk_member, trunc(tmp.pay_time), #{endDate}) + values + (tmp.pk_member, + 5, + 1, + tmp.assess_status, + tmp.pk_member, + trunc(tmp.pay_time), + #{endDate}) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/MemberAssessParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/MemberAssessParam.java index 263c0527..ad9eb3e2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/MemberAssessParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/param/MemberAssessParam.java @@ -23,6 +23,11 @@ public class MemberAssessParam implements Serializable { */ private String memberCode; + /** + * 考核状态 + */ + private Integer assessStatus; + /** * 考核类型 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java index a0a76aea..b2270a39 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberAssessVO.java @@ -12,12 +12,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员信息-会员考核记录VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class CuMemberAssessVO implements Serializable { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/MemberAssessVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/MemberAssessVO.java index b7c16c45..e640e513 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/MemberAssessVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/vo/MemberAssessVO.java @@ -1,11 +1,14 @@ package com.hzs.member.detail.vo; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.BigDecimalFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 会员考核列表返回VO @@ -51,10 +54,18 @@ public class MemberAssessVO implements Serializable { /** * 考核目标 */ + @BigDecimalFormat private BigDecimal assessTarget; /** * 新増业绩 */ + @BigDecimalFormat private BigDecimal monthAdd; + /** + * 免考通过时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml index 49ea814f..4d4f8af1 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessMapper.xml @@ -170,6 +170,9 @@ and cm.member_code like #{param.memberCode} || '%' + + and cma.assess_status = #{param.assessStatus} + and cma.assess_type in 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 9c1357b8..5df80e77 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 @@ -2114,7 +2114,7 @@ public class EnumsController extends BaseController { public AjaxResult assessStatus() { List enumEntityList = new ArrayList<>(); for (EAssessStatus value : EAssessStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ASSESS_STATUS)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java index 9e40d9f0..da62d6c8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAssessStatus.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,19 +13,19 @@ public enum EAssessStatus { /** * 0=考核通过 1=免考通过 2=考核不通过 3=不考核 */ - EXAMINE_PASS(0, "考核通过", 0, EnumsPrefixConstants.ASSESS_STATUS + 0), + EXAMINE_PASS(0, "考核通过", 0), /** * 1=免考通过 */ - EXEMPT_PASS(1, "免考通过", 0, EnumsPrefixConstants.ASSESS_STATUS + 1), + EXEMPT_PASS(1, "免考通过", 0), /** * 2=考核不通过 */ - EXAMINE_NO_PASS(2, "考核不通过", 0, EnumsPrefixConstants.ASSESS_STATUS + 2), + EXAMINE_NO_PASS(2, "考核不通过", 0), /** * 3=不考核 */ - NO_EXAMINE(3, "不考核", 0, EnumsPrefixConstants.ASSESS_STATUS + 3), + NO_EXAMINE(3, "不考核", 0), ; @@ -42,10 +41,6 @@ public enum EAssessStatus { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; public static String getLabelByValue(Integer value) { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAssessStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAssessStatus.java index 39f0cccf..b572bc7a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAssessStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAssessStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 考核状态(会员端专用) - * @Author: sui q - * @Time: 2022/11/9 13:33 - * @Classname: EAssessStatus - * @PackageName: com.hzs.common.core.enums + * 考核状态(会员端专用) */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERepurchaseType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERepurchaseType.java index 4bf417d7..62ecd7ed 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERepurchaseType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ERepurchaseType.java @@ -4,13 +4,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/19 9:07 - * @Classname: ERepurchaseType - * @PackageName: com.hzs.common.enums - */ @Getter @AllArgsConstructor public enum ERepurchaseType { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java index da29c05b..2ffccebb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/EnumEntity.java @@ -8,8 +8,6 @@ import java.util.List; /** * 枚举统一返回实体 - * - * @author: jiiangchao */ @AllArgsConstructor @Data @@ -69,9 +67,9 @@ public class EnumEntity { /** * 需要翻译的构造函数 * - * @param value 值 - * @param label 标签 - * @param field 字段 + * @param value 值 + * @param label 标签 + * @param field 字段 * @param transactionKey 翻译健 */ public EnumEntity(int value, String label, String field, String transactionKey) { diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAssess.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAssess.java index e247cc58..fff33820 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAssess.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAssess.java @@ -1,6 +1,7 @@ package com.hzs.common.domain.member.detail; import java.math.BigDecimal; +import java.util.Date; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; @@ -109,5 +110,16 @@ public class CuMemberAssess extends BaseEntity { @TableField("MONTH_SURPLUS") private BigDecimal monthSurplus; + /** + * 免考开始时间 + */ + @TableField("START_DATE") + private Date startDate; + + /** + * 免考结束时间 + */ + @TableField("END_DATE") + private Date endDate; }