From 957dc0f8a463d76fcf0ed69e678e2fdd7bba0662 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 12 Jun 2025 20:39:15 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=BB=93=E7=AE=97=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=89=8B=E5=8A=A8=E6=BF=80=E6=B4=BB=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ICuMemberServiceLogServiceApi.java | 27 ++-- .../service/impl/BonusSettleRangeHandle.java | 115 ++++++++++------- .../achieve/CuMemberRetailRangeMapper.xml | 6 +- .../mapper/CuMemberServiceLogMapper.java | 42 +++---- .../provider/CuMemberServiceLogProvider.java | 83 +++---------- .../service/ICuMemberServiceLogService.java | 57 +++------ .../impl/CuMemberServiceLogServiceImpl.java | 116 +++--------------- .../detail/CuMemberServiceLogMapper.xml | 43 ++++--- .../achieve/ext/CuMemberRetailRangeExt.java | 10 -- .../member/detail/CuMemberServiceLog.java | 9 +- 10 files changed, 179 insertions(+), 329 deletions(-) diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java index 417f7da7..412dd054 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java @@ -3,16 +3,11 @@ package com.hzs.member.detail; import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.CuMemberServiceLogExt; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/13 19:02 - * @Classname: ICuMemberServiceLogServiceApi - * @PackageName: com.hzs.member.detail - */ public interface ICuMemberServiceLogServiceApi { /** @@ -20,13 +15,9 @@ public interface ICuMemberServiceLogServiceApi { * * @param pkMember 会员编号 * @param editTypeList 查询类型 - * @return: List - * @Author: sui q - * @Date: 2023/3/13 18:51 */ List queryMaxCuMemberServiceLog(Long pkMember, List editTypeList); - /** * 查询最大审核次数 * @@ -60,11 +51,7 @@ public interface ICuMemberServiceLogServiceApi { R updateByBusinessNo(CuMemberServiceLog memberLog); /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:15 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> + * 根据业务单号查询业务日志 **/ R> selectCuMemberServiceLog(String businessNo); @@ -94,4 +81,12 @@ public interface ICuMemberServiceLogServiceApi { */ R selectTopData(Long pkMember, int editType, int approveStatus); + /** + * 查询激活操作数据 + * + * @param queryDate + * @return + */ + R> listActivateLog(@Param("queryDate") Date queryDate); + } 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 03c5472f..5526bf49 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 @@ -22,6 +22,7 @@ import com.hzs.common.domain.member.bonus.*; import com.hzs.common.domain.member.detail.CuMemberAwards; import com.hzs.common.domain.member.detail.CuMemberGrade; import com.hzs.common.domain.member.detail.CuMemberLevel; +import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.ext.BdWaresBonusExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; @@ -30,13 +31,16 @@ import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdRangeAwards; +import com.hzs.member.detail.ICuMemberServiceLogServiceApi; import com.hzs.system.config.dto.BonusConfigDTO; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.stream.Collectors; /** * 计算乐享极差收益 @@ -57,6 +61,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { @Autowired private IBonusOrderService iBonusOrderService; + @DubboReference + ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi; + /** * 秒结： * 实时计算秒结数据（业绩、盒数、等级、奖衔、日奖） @@ -102,6 +109,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } + // 当期的手动激活的记录列表 + Map activateMap = this.getActivateMap(saOrderExt.getPayTime()); + // 计算自消费奖衔 CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); // 先算等级 注册、升级计算等级 @@ -129,9 +139,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 会员奖衔升级记录 List cuMemberAwardsList = new ArrayList<>(); // 计算自己等级、奖衔等 - calculateGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt); + calculateGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, + cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt, activateMap); // 计算团队业绩、盒数，计算等级、奖衔 - cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, boxNum, cuMemberGradeList)); + cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, + secondRangeTableName, boxNum, cuMemberGradeList, activateMap)); // 奖金处理 List cuMemberBonusRangeList = new ArrayList<>(); @@ -235,7 +247,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (CuMemberRetailRangeExt cuMemberRetailRangeExt : memberRetailRangeExtList) { if (!memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { - cuMemberRetailRangeExt.setBuyNum(0); memberRangeExtMap.put(cuMemberRetailRangeExt.getPkMember(), cuMemberRetailRangeExt); } } @@ -399,6 +410,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 更新注水 iCuMemberRetailRangeService.mergeCuMemberRetailRangeBySpecial(rangeTableName, period); + // 当期的手动激活的记录列表 + Map activateMap = this.getActivateMap(settleStartDate); + if (retailOrderList.size() > 0) { Map memberLevelMap = new HashMap<>(); List memberLevelList = iCuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName); @@ -409,8 +423,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 会员结算map（key：会员ID，value：结算扩展） Map memberRangeExtMap = new HashMap<>(); - // 购买升级等级map（key:等级值，value:等级对象） - Map retaiBuyGradeMap = new TreeMap<>(); // 团队升级等级map（key:等级值，value:等级对象） Map retailTeamGradeMap = new TreeMap<>(); // 等级map（key:等级值，value:等级对象） @@ -420,9 +432,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 等级列表 List retaiGradeList = bonusConfigDTO.getRetaiGradeList(); for (BdGrade bdGrade : retaiGradeList) { - if (bdGrade.getBoxNumber() > 0) { - retaiBuyGradeMap.put(bdGrade.getGradeValue(), bdGrade); - } if (bdGrade.getBoxTotal() > 0) { retailTeamGradeMap.put(bdGrade.getGradeValue(), bdGrade); } @@ -437,17 +446,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { for (CuMemberRetailRangeExt cuMemberRetailRangeExt : memberRetailRangeExtList) { if (!memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { - cuMemberRetailRangeExt.setBuyNum(0); - // TODO new 目前一次性补差升级，不需要校验是不是当天了 - cuMemberRetailRangeExt.setSameDate(EYesNo.NO.getIntValue()); - for (Integer gradeValue : retaiBuyGradeMap.keySet()) { - BdGrade bdGrade = retaiBuyGradeMap.get(gradeValue); - if (bdGrade.getBoxNumber() > 0 && cuMemberRetailRangeExt.getGradeValue().equals(gradeValue)) { - // TODO new 一次性补差，需要下个等级的盒数 - 当前等级盒数？？？ - cuMemberRetailRangeExt.setBuyNum(bdGrade.getBoxNumber()); - break; - } - } memberRangeExtMap.put(cuMemberRetailRangeExt.getPkMember(), cuMemberRetailRangeExt); } } @@ -469,18 +467,19 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { List cuMemberBonusDetailList = new ArrayList<>(); // 上面更新网体，按会员表是否激活进行处理 -// for (SaOrderExt saOrderExt : retailOrderList) { -// CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); -// if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || -// EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { -// // 注册、升级才能算激活状态 -// sourceMemberRangeExt.setEnableStatus(EYesNo.YES.getIntValue()); -// } -// } + for (SaOrderExt saOrderExt : retailOrderList) { + CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); + if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || + EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { + // 注册、升级才能算激活状态 + sourceMemberRangeExt.setEnableStatus(EYesNo.YES.getIntValue()); + } + } for (SaOrderExt saOrderExt : retailOrderList) { // 计算自消费奖衔 CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember()); + // 订单指定产品盒数（计算等级使用） int boxNum = 0; for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { @@ -498,9 +497,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve)); sourceMemberRangeExt.setNewConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getNewConsumePv(), orderAchieve)); // 计算自己等级、奖衔等 - calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt); + calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, + null, cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt, activateMap); // 计算团队业绩、盒数，计算等级、奖衔 - cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, boxNum, cuMemberGradeList)); + cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, + retailTeamGradeMap, retailAwardsMap, null, boxNum, cuMemberGradeList, activateMap)); // 计算奖金 直推级差 + 平级收益 if ((EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() @@ -513,25 +514,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); // 计算完奖金算等级 - if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { - // 计算个人等级，消费等级 - int waresQuantity = saOrderItems.getWaresQuantity(); - int buyBoxNum = sourceMemberRangeExt.getBuyNum() + waresQuantity; + if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { + // 订单存在升级记录 if (memberLevelMap.containsKey(saOrderExt.getPkId())) { CuMemberLevel cuMemberLevel = memberLevelMap.get(saOrderExt.getPkId()); if (gradeIdMap.containsKey(cuMemberLevel.getNewLevel())) { BdGrade bdGrade = gradeIdMap.get(cuMemberLevel.getNewLevel()); if (bdGrade.getGradeValue() > sourceMemberRangeExt.getGradeValue()) { - sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); sourceMemberRangeExt.setPkGrade(bdGrade.getPkId()); + sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); sourceMemberRangeExt.setGradeName(bdGrade.getGradeName()); - if (sourceMemberRangeExt.getSameDate() == EYesNo.NO.getIntValue()) { - sourceMemberRangeExt.setBuyNum(bdGrade.getBoxNumber()); - } else { - sourceMemberRangeExt.setBuyNum(buyBoxNum); - } } } } @@ -850,7 +843,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { */ public List calculateRetailRangeGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, - Integer boxNum, List cuMemberGradeList) { + Integer boxNum, List cuMemberGradeList, Map activateMap) { // 会员奖衔升级列表 List cuMemberAwardsList = new ArrayList<>(); // 订单会员 @@ -860,7 +853,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal orderAchieve = saOrderExt.getOrderAchieve(); BigDecimal orderAmount = saOrderExt.getOrderAmount(); - while (targetMemberRangeExt != null) { + while (null != targetMemberRangeExt) { + // 手动激活时间 + if (EYesNo.NO.getIntValue() == targetMemberRangeExt.getEnableStatus() + && activateMap.containsKey(targetMemberRangeExt.getPkMember())) { + // 存在手动激活 + targetMemberRangeExt.setEnableStatus(EYesNo.YES.getIntValue()); + } + // 激活的账号才能累计业绩和盒数（有注册、升级订单） if (targetMemberRangeExt.getEnableStatus() == EYesNo.YES.getIntValue()) { // 累计业绩 @@ -876,7 +876,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { targetMemberRangeExt.setTeamNewBoxNum(targetMemberRangeExt.getTeamNewBoxNum() + boxNum); // 计算等级 calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, - secondRangeTableName, cuMemberGradeList, cuMemberAwardsList, targetMemberRangeExt); + secondRangeTableName, cuMemberGradeList, cuMemberAwardsList, targetMemberRangeExt, activateMap); } targetMemberRangeExt = memberRangeExtMap.get(targetMemberRangeExt.getPkParent()); } @@ -886,7 +886,13 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { private void calculateGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, List cuMemberGradeList, List cuMemberAwardsList, - CuMemberRetailRangeExt targetMemberRangeExt) { + CuMemberRetailRangeExt targetMemberRangeExt, Map activateMap) { + if (EYesNo.NO.getIntValue() == targetMemberRangeExt.getEnableStatus() + && activateMap.containsKey(targetMemberRangeExt.getPkMember())) { + // 存在手动激活 + targetMemberRangeExt.setEnableStatus(EYesNo.YES.getIntValue()); + } + // 遍历团队等级map（V4,V5） for (Integer gradeValue : retailTeamGradeMap.keySet()) { BdGrade bdGrade = retailTeamGradeMap.get(gradeValue); @@ -2141,4 +2147,23 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusDetail.setPkCreator(MagicNumberConstants.PK_ADMIN); return cuMemberBonusDetail; } + + /** + * 获取手动激活map + * + * @param settleStartDate + * @return + */ + private Map getActivateMap(Date settleStartDate) { + // 当期的手动激活的记录列表 + List activateList = iCuMemberServiceLogServiceApi.listActivateLog(settleStartDate).getData(); + return activateList.stream() + .collect(Collectors.groupingBy( + CuMemberServiceLog::getPkMember, + Collectors.collectingAndThen( + Collectors.minBy(Comparator.comparing(CuMemberServiceLog::getCreationTime)), + optional -> optional.get().getCreationTime() + ) + )); + } } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml index 434d7cb1..1d67a693 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml @@ -299,7 +299,7 @@ a.pk_country, a.pk_settle_country, a.pk_share_awards, - nvl(cm.is_activate, a.enable_status) enable_status， + a.enable_status, consume_box_num, new_box_num, team_box_num, @@ -335,10 +335,6 @@ start with pk_member = #{item} connect by pk_member = prior pk_parent ) a - left join cu_member cm - on cm.pk_id = a.pk_member - and cm.del_flag = 0 - and cm.category = 0 inner join bd_grade ba on a.pk_grade = ba.pk_id inner join bd_awards bw diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java index f489947d..85c3bd86 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java @@ -7,35 +7,25 @@ import com.hzs.member.detail.vo.CuMemberServiceLogVO; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** * 会员更名、密码修改表 Mapper 接口 - * - * @author hzs - * @since 2022-08-22 */ public interface CuMemberServiceLogMapper extends BaseMapper { Integer selectByMaxApproveNumber(@Param("pkMember") Long pkMember, @Param("editType") Integer editType, @Param("approveStatus") Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:08 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询会员办理业务日志最新数据 **/ CuMemberServiceLog selectTopData(@Param("pkMember") Long pkMember, @Param("editType") int editType, @Param("approveStatus") int approveStatus); /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:26 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -48,20 +38,12 @@ public interface CuMemberServiceLogMapper extends BaseMapper List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询审核通过的最新数据 **/ CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO); /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); @@ -109,15 +91,19 @@ public interface CuMemberServiceLogMapper extends BaseMapper CuMemberServiceLogExt queryPolicy(@Param("pkMember") Long pkMember); /** - * @description: 查询会员办理业务日志表最新数据 - * @author: zhang jing - * @date: 2024/11/21 9:56 - * @param: [pkMember, editTypeList, approveStatus] - * @return: java.util.List + * 查询会员办理业务日志表最新数据 **/ List selectTopDataList(@Param("pkMember") Long pkMember, @Param("editTypeList") List editTypeList, @Param("approveStatus") int approveStatus, @Param("actEndDateStr") String actEndDateStr); + /** + * 查询激活操作数据 + * + * @param queryDate + * @return + */ + List listActivateLog(@Param("queryDate") Date queryDate); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java index 3dbb6619..0fc5091e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java @@ -1,6 +1,6 @@ package com.hzs.member.detail.provider; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.CuMemberServiceLogExt; @@ -9,109 +9,66 @@ import com.hzs.member.detail.service.ICuMemberServiceLogService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/13 19:04 - * @Classname: CuMemberServiceLogProvider - * @PackageName: com.hzs.member.detail.provider - */ @DubboService public class CuMemberServiceLogProvider implements ICuMemberServiceLogServiceApi { - private ICuMemberServiceLogService cuMemberServiceLogService; - @Autowired - public void setCuMemberServiceLogService(ICuMemberServiceLogService cuMemberServiceLogService) { - this.cuMemberServiceLogService = cuMemberServiceLogService; - } + private ICuMemberServiceLogService iCuMemberServiceLogService; @Override public List queryMaxCuMemberServiceLog(Long pkMember, List editTypeList) { - return cuMemberServiceLogService.queryMaxCuMemberServiceLog(pkMember, editTypeList); + return iCuMemberServiceLogService.queryMaxCuMemberServiceLog(pkMember, editTypeList); } - /** - * 查询最大审核次数 - * - * @param pkMember - * @param editType - * @return - */ @Override public Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus) { - return cuMemberServiceLogService.selectByMaxApproveNumber(pkMember, editType, approveStatus); + return iCuMemberServiceLogService.selectByMaxApproveNumber(pkMember, editType, approveStatus); } - /** - * 新增 - * - * @param memberLog - * @return - */ @Override public R insert(CuMemberServiceLog memberLog) { - return R.ok(cuMemberServiceLogService.save(memberLog)); + return R.ok(iCuMemberServiceLogService.save(memberLog)); } - /** - * 根据业务单号查询 - * - * @return - */ @Override public R selectByBusinessNo(String businessNo) { - return cuMemberServiceLogService.selectByBusinessNo(businessNo); + return iCuMemberServiceLogService.selectByBusinessNo(businessNo); } - /** - * 根据业务单号修改信息 - * - * @param memberLog - * @return - */ @Override public R updateByBusinessNo(CuMemberServiceLog memberLog) { - return cuMemberServiceLogService.updateByBusinessNo(memberLog); + return iCuMemberServiceLogService.updateByBusinessNo(memberLog); } - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> selectCuMemberServiceLog(String businessNo) { - return cuMemberServiceLogService.selectCuMemberServiceLog(businessNo); + return iCuMemberServiceLogService.selectCuMemberServiceLog(businessNo); } @Override public R queryPolicy(Long pkMember) { - return R.ok(cuMemberServiceLogService.queryPolicy(pkMember)); + return R.ok(iCuMemberServiceLogService.queryPolicy(pkMember)); } - /** - * @param pkMember 会员主键 pkMember - * @param approvalBusiness 类型 EApprovalBusiness - * @param approveStatus 提交签呈状态 EApproveStatus - * @return - */ @Override public R queryCount(Long pkMember, Integer approvalBusiness, Integer approveStatus) { - QueryWrapper query = new QueryWrapper<>(); - query.eq("APPROVE_STATUS", approveStatus); - query.eq("EDIT_TYPE", approvalBusiness); - query.eq("PK_MEMBER", pkMember); - return R.ok(cuMemberServiceLogService.count(query)); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CuMemberServiceLog::getApproveStatus, approveStatus); + query.eq(CuMemberServiceLog::getEditType, approvalBusiness); + query.eq(CuMemberServiceLog::getPkMember, pkMember); + return R.ok(iCuMemberServiceLogService.count(query)); } @Override public R selectTopData(Long pkMember, int editType, int approveStatus) { - return R.ok(cuMemberServiceLogService.selectTopData(pkMember, editType, approveStatus)); + return R.ok(iCuMemberServiceLogService.selectTopData(pkMember, editType, approveStatus)); } + @Override + public R> listActivateLog(Date queryDate) { + return R.ok(iCuMemberServiceLogService.listActivateLog(queryDate)); + } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java index a9e43e23..f1ba72b5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java @@ -6,14 +6,13 @@ import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.CuMemberServiceLogExt; import com.hzs.member.detail.vo.CuMemberServiceLogVO; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** * 会员更名、密码修改表 服务类 - * - * @author hzs - * @since 2022-08-22 */ public interface ICuMemberServiceLogService extends IService { @@ -27,20 +26,12 @@ public interface ICuMemberServiceLogService extends IService Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:07 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询会员办理业务日志最新数据 **/ CuMemberServiceLog selectTopData(Long pkMember, int editType, int approveStatus); /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:25 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -53,29 +44,17 @@ public interface ICuMemberServiceLogService extends IService List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询审核通过的最新数据 **/ CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO); /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); /** - * @description: 再次发起签呈 - * @author: zhang jing - * @date: 2023/2/2 11:15 - * @param: [cmslList, cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 再次发起签呈 **/ CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO); @@ -123,11 +102,7 @@ public interface ICuMemberServiceLogService extends IService List queryList(Integer editType, String memberCode, String memberName, Integer pkCountry, Integer approveStatus); /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [businessNo] - * @return: com.hzs.common.core.domain.R> + * 根据业务单号查询业务日志 **/ R> selectCuMemberServiceLog(String businessNo); @@ -147,12 +122,16 @@ public interface ICuMemberServiceLogService extends IService CuMemberServiceLogExt queryPolicy(Long pkMember); /** - * @description: 查询会员多个办理业务的日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:07 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询会员多个办理业务的日志最新数据 **/ - CuMemberServiceLogVO selectTopDataList(Long pkMember, List editType, int approveStatus,String actEndDateStr); + CuMemberServiceLogVO selectTopDataList(Long pkMember, List editType, int approveStatus, String actEndDateStr); + + /** + * 查询激活操作数据 + * + * @param queryDate + * @return + */ + List listActivateLog(@Param("queryDate") Date queryDate); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java index 02f8fa07..e7aa36c4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java @@ -31,91 +31,40 @@ import java.util.stream.Collectors; /** * 会员更名、密码修改表 服务实现类 - * - * @author hzs - * @since 2022-08-22 */ @Service public class CuMemberServiceLogServiceImpl extends ServiceImpl implements ICuMemberServiceLogService { - /** - * 查询最大审核次数 - * - * @param pkMember - * @param editType - * @return - */ + @Override public Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus) { return baseMapper.selectByMaxApproveNumber(pkMember, editType, approveStatus); } - /** - * @description: 查询会员办理业务日志最新数据 - * @author: zhang jing - * @date: 2023/3/24 9:08 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ @Override public CuMemberServiceLog selectTopData(Long pkMember, int editType, int approveStatus) { return baseMapper.selectTopData(pkMember, editType, approveStatus); } - - /** - * @description: 查询用户是否已经存在未审核业务 - * @author: zhang jing - * @date: 2023/1/29 17:26 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List - **/ @Override public List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO) { return baseMapper.selectServiceLogList(cuMemberServiceLogVO); } - /** - * 查询 - * - * @param cuMemberServiceLog - * @return - */ @Override public List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog) { return baseMapper.selectByServiceLogList(cuMemberServiceLog); } - /** - * @description: 查询审核通过的最新数据 - * @author: zhang jing - * @date: 2023/1/30 10:02 - * @param: [cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO - **/ @Override public CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO) { return baseMapper.selectNewestServiceLog(cuMemberServiceLogVO); } - /** - * @description: 查询会员原值 - * @author: zhang jing - * @date: 2023/1/30 14:20 - * @param: [cuMemberOldValueVO] - * @return: java.util.List - **/ @Override public List selectOldValue(BusinessMemberVO businessMemberVO) { return baseMapper.selectOldValue(businessMemberVO); } - /** - * @description: 再次发起签呈 - * @author: zhang jing - * @date: 2023/2/2 9:09 - * @param: [cmslList] - * @return: boolean - **/ @Transactional(rollbackFor = Exception.class) @Override public CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO) { @@ -151,11 +100,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl selectByBusinessNo(String businessNo) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -163,12 +107,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl updateByBusinessNo(CuMemberServiceLog memberLog) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -176,28 +114,11 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl queryList(Integer editType, String memberCode, String memberName, Integer pkCountry, Integer approveStatus) { return baseMapper.queryList(editType, memberCode, memberName, pkCountry, approveStatus); } - /** - * @description: 根据业务单号查询业务日志 - * @author: zhang jing - * @date: 2023/7/29 11:16 - * @param: [cuMemberServiceLog] - * @return: java.util.List - **/ @Override public R> selectCuMemberServiceLog(String businessNo) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -205,11 +126,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl selectByList(CuMemberServiceLogExt memberServiceLogExt) { return baseMapper.selectByList(memberServiceLogExt); @@ -225,28 +141,23 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl editType, int approveStatus,String actEndDateStr) { - CuMemberServiceLogVO cmvo=new CuMemberServiceLogVO(); - List cmsList=baseMapper.selectTopDataList(pkMember, editType, approveStatus,actEndDateStr); - if(CollectionUtil.isNotEmpty(cmsList)){ + public CuMemberServiceLogVO selectTopDataList(Long pkMember, List editType, int approveStatus, String actEndDateStr) { + CuMemberServiceLogVO cmvo = new CuMemberServiceLogVO(); + List cmsList = baseMapper.selectTopDataList(pkMember, editType, approveStatus, actEndDateStr); + if (CollectionUtil.isNotEmpty(cmsList)) { List sortedCmsList = cmsList.stream() .sorted(Comparator.comparing(CuMemberServiceLog::getCreationTime)) .collect(Collectors.toList()); - for(CuMemberServiceLog cms: sortedCmsList){ + for (CuMemberServiceLog cms : sortedCmsList) { cms.setPkMember(pkMember); - if(cms.getEditType()== EApprovalBusiness.CHANGE_NAME.getValue()){ + if (cms.getEditType() == EApprovalBusiness.CHANGE_NAME.getValue()) { cmvo.setOldName(cms.getOldValue()); - }if(cms.getEditType()== EApprovalBusiness.CHANGE_PHONE.getValue()){ + } + if (cms.getEditType() == EApprovalBusiness.CHANGE_PHONE.getValue()) { cmvo.setOldPhone(cms.getOldValue()); - }if(cms.getEditType()== EApprovalBusiness.DOMICILE_CHANGE.getValue()){ + } + if (cms.getEditType() == EApprovalBusiness.DOMICILE_CHANGE.getValue()) { DomicileChangeVO oldValue = JSONUtil.toBean(cms.getOldValue(), DomicileChangeVO.class); cmvo.setOldPhone(oldValue.getPhone()); cmvo.setOldName(oldValue.getMemberName()); @@ -256,5 +167,8 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl listActivateLog(Date queryDate) { + return baseMapper.listActivateLog(queryDate); + } } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml index 72ee452c..0a6edc51 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml @@ -348,23 +348,34 @@ + + + diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java index 8cef6955..f7255570 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java @@ -35,16 +35,6 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange { */ private String awardsName; - /** - * 是否相同日，注册日是累计升级 - */ - private Integer sameDate; - - /** - * 注册升级购买数量 - */ - private Integer buyNum; - /** * 极差比例 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java index b9d7d420..4b5be867 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; @@ -15,12 +17,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 办理业务记录信息表 - *

- * - * @author hzs - * @since 2022-08-22 */ @Data @Builder @@ -103,7 +100,7 @@ public class CuMemberServiceLog extends BaseEntity { private BigDecimal singleAmount; /** - * 批次单号（大单号） + * 批次单号（大单号） */ @TableField(exist = false) private String orderNumber;