angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 结算时处理手动激活的数据处理；

This commit is contained in:
cabbage 2025-06-12 20:39:15 +08:00
parent ccec401f84
commit 849f8e6128
10 changed files with 179 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java
View File

@ -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<CuMemberServiceLog>
* @Author: sui q
* @Date: 2023/3/13 18:51
*/
List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList);
/**
* 查询最大审核次数
*
@ -60,11 +51,7 @@ public interface ICuMemberServiceLogServiceApi {
R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog);
/**
* @description: 根据业务单号查询业务日志
* @author: zhang jing
* @date: 2023/7/29 11:15
* @param: [businessNo]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
* 根据业务单号查询业务日志
**/
R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo);
@ -94,4 +81,12 @@ public interface ICuMemberServiceLogServiceApi {
*/
R<CuMemberServiceLog> selectTopData(Long pkMember, int editType, int approveStatus);
/**
* 查询激活操作数据
*
* @param queryDate
* @return
*/
R<List<CuMemberServiceLog>> listActivateLog(@Param("queryDate") Date queryDate);
}

115
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -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<Long, Date> activateMap = this.getActivateMap(saOrderExt.getPayTime());
// 计算自消费奖衔
CuMemberRetailRangeExt sourceMemberRangeExt = memberRangeExtMap.get(saOrderExt.getPkMember());
// 先算等级 注册、升级计算等级
@ -129,9 +139,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 会员奖衔升级记录
List<CuMemberAwards> 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<CuMemberBonusRange> 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<Long, Date> activateMap = this.getActivateMap(settleStartDate);
if (retailOrderList.size() > 0) {
Map<Long, CuMemberLevel> memberLevelMap = new HashMap<>();
List<CuMemberLevel> memberLevelList = iCuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName);
@ -409,8 +423,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 会员结算map（key：会员ID，value：结算扩展）
Map<Long, CuMemberRetailRangeExt> memberRangeExtMap = new HashMap<>();
// 购买升级等级map（key:等级值，value:等级对象）
Map<Integer, BdGrade> retaiBuyGradeMap = new TreeMap<>();
// 团队升级等级map（key:等级值，value:等级对象）
Map<Integer, BdGrade> retailTeamGradeMap = new TreeMap<>();
// 等级map（key:等级值，value:等级对象）
@ -420,9 +432,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
// 等级列表
List<BdGrade> 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<CuMemberBonusDetail> 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<CuMemberAwards> calculateRetailRangeGradeAwards(Integer period, Map<Long, CuMemberRetailRangeExt> memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt,
Map<Integer, BdGrade> retailTeamGradeMap, Map<Integer, BdAwards> retailAwardsMap, String secondRangeTableName,
Integer boxNum, List<CuMemberGrade> cuMemberGradeList) {
Integer boxNum, List<CuMemberGrade> cuMemberGradeList, Map<Long, Date> activateMap) {
// 会员奖衔升级列表
List<CuMemberAwards> 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<Long, CuMemberRetailRangeExt> memberRangeExtMap, String rangeTableName,
SaOrderExt saOrderExt, Map<Integer, BdGrade> retailTeamGradeMap, Map<Integer, BdAwards> retailAwardsMap,
String secondRangeTableName, List<CuMemberGrade> cuMemberGradeList, List<CuMemberAwards> cuMemberAwardsList,
CuMemberRetailRangeExt targetMemberRangeExt) {
CuMemberRetailRangeExt targetMemberRangeExt, Map<Long, Date> 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<Long, Date> getActivateMap(Date settleStartDate) {
// 当期的手动激活的记录列表
List<CuMemberServiceLog> 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()
)
));
}
}

6
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
View File

@ -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

42
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java
View File

@ -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<CuMemberServiceLog> {
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<com.hzs.common.domain.member.detail.CuMemberServiceLog>
* 查询用户是否已经存在未审核业务
**/
List<CuMemberServiceLogVO> selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO);
@ -48,20 +38,12 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
List<CuMemberServiceLogExt> 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<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
* 查询会员原值
**/
List<BusinessMemberVO> selectOldValue(BusinessMemberVO businessMemberVO);
@ -109,15 +91,19 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
CuMemberServiceLogExt queryPolicy(@Param("pkMember") Long pkMember);
/**
* @description: 查询会员办理业务日志表最新数据
* @author: zhang jing
* @date: 2024/11/21 9:56
* @param: [pkMember, editTypeList, approveStatus]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
* 查询会员办理业务日志表最新数据
**/
List<CuMemberServiceLog> selectTopDataList(@Param("pkMember") Long pkMember,
@Param("editTypeList") List<Integer> editTypeList,
@Param("approveStatus") int approveStatus,
@Param("actEndDateStr") String actEndDateStr);
/**
* 查询激活操作数据
*
* @param queryDate
* @return
*/
List<CuMemberServiceLog> listActivateLog(@Param("queryDate") Date queryDate);
}

83
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java
View File

@ -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<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> 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<Boolean> insert(CuMemberServiceLog memberLog) {
return R.ok(cuMemberServiceLogService.save(memberLog));
return R.ok(iCuMemberServiceLogService.save(memberLog));
}
/**
* 根据业务单号查询
*
* @return
*/
@Override
public R<CuMemberServiceLog> selectByBusinessNo(String businessNo) {
return cuMemberServiceLogService.selectByBusinessNo(businessNo);
return iCuMemberServiceLogService.selectByBusinessNo(businessNo);
}
/**
* 根据业务单号修改信息
*
* @param memberLog
* @return
*/
@Override
public R<Boolean> 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<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
**/
@Override
public R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo) {
return cuMemberServiceLogService.selectCuMemberServiceLog(businessNo);
return iCuMemberServiceLogService.selectCuMemberServiceLog(businessNo);
}
@Override
public R<CuMemberServiceLogExt> 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<Integer> queryCount(Long pkMember, Integer approvalBusiness, Integer approveStatus) {
QueryWrapper<CuMemberServiceLog> 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<CuMemberServiceLog> 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<CuMemberServiceLog> 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<List<CuMemberServiceLog>> listActivateLog(Date queryDate) {
return R.ok(iCuMemberServiceLogService.listActivateLog(queryDate));
}
}

55
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java
View File

@ -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<CuMemberServiceLog> {
@ -27,20 +26,12 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
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<com.hzs.common.domain.member.detail.CuMemberServiceLog>
* 查询用户是否已经存在未审核业务
**/
List<CuMemberServiceLogVO> selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO);
@ -53,29 +44,17 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
List<CuMemberServiceLogExt> 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<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
* 查询会员原值
**/
List<BusinessMemberVO> 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<CuMemberServiceLog> cmslList, CuMemberServiceLogVO cuMemberServiceLogVO);
@ -123,11 +102,7 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
List<CuMemberServiceLog> 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<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
* 根据业务单号查询业务日志
**/
R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo);
@ -147,12 +122,16 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
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<Integer> editType, int approveStatus, String actEndDateStr);
/**
* 查询激活操作数据
*
* @param queryDate
* @return
*/
List<CuMemberServiceLog> listActivateLog(@Param("queryDate") Date queryDate);
}

104
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java
View File

@ -31,91 +31,40 @@ import java.util.stream.Collectors;
/**
* 会员更名、密码修改表 服务实现类
*
* @author hzs
* @since 2022-08-22
*/
@Service
public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLogMapper, CuMemberServiceLog> 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<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@Override
public List<CuMemberServiceLogVO> selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO) {
return baseMapper.selectServiceLogList(cuMemberServiceLogVO);
}
/**
* 查询
*
* @param cuMemberServiceLog
* @return
*/
@Override
public List<CuMemberServiceLogExt> 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<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
**/
@Override
public List<BusinessMemberVO> 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<CuMemberServiceLog> cmslList, CuMemberServiceLogVO cuMemberServiceLogVO) {
@ -151,11 +100,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return baseMapper.queryMaxCuMemberServiceLog(pkMember, editTypeList);
}
/**
* 根据业务单号查询
*
* @return
*/
@Override
public R<CuMemberServiceLog> selectByBusinessNo(String businessNo) {
QueryWrapper<CuMemberServiceLog> queryWrapper = new QueryWrapper<>();
@ -163,12 +107,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return R.ok(baseMapper.selectOne(queryWrapper));
}
/**
* 根据业务单号修改信息
*
* @param memberLog
* @return
*/
@Override
public R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog) {
UpdateWrapper<CuMemberServiceLog> updateWrapper = new UpdateWrapper<>();
@ -176,28 +114,11 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return R.ok(baseMapper.update(memberLog, updateWrapper) == 1);
}
/**
* 查询列表信息
*
* @param editType
* @param memberCode
* @param memberName
* @param pkCountry
* @param approveStatus
* @return
*/
@Override
public List<CuMemberServiceLog> 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<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@Override
public R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo) {
QueryWrapper<CuMemberServiceLog> queryWrapper = new QueryWrapper<>();
@ -205,11 +126,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return R.ok(baseMapper.selectList(queryWrapper));
}
/**
* 查询展示列表
*
* @return
*/
@Override
public List<CuMemberServiceLog> selectByList(CuMemberServiceLogExt memberServiceLogExt) {
return baseMapper.selectByList(memberServiceLogExt);
@ -225,13 +141,6 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return baseMapper.queryPolicy(pkMember);
}
/**
* @description: 查询会员办理业务日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:08
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@Override
public CuMemberServiceLogVO selectTopDataList(Long pkMember, List<Integer> editType, int approveStatus, String actEndDateStr) {
CuMemberServiceLogVO cmvo = new CuMemberServiceLogVO();
@ -244,9 +153,11 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
cms.setPkMember(pkMember);
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<CuMemberServiceLo
return cmvo;
}
@Override
public List<CuMemberServiceLog> listActivateLog(Date queryDate) {
return baseMapper.listActivateLog(queryDate);
}
}

11
bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml
View File

@ -367,4 +367,15 @@
where rownum &lt;= 2
</select>
<!-- 查询激活操作数据 -->
<select id="listActivateLog" resultType="com.hzs.common.domain.member.detail.CuMemberServiceLog">
select cmsl.*
from CU_MEMBER_SERVICE_LOG cmsl
where cmsl.del_flag = 0
and cmsl.edit_type = 137
and cmsl.new_value = 0
and to_char(cmsl.creation_time, 'yyyy-mm-dd') = to_char(#{queryDate}, 'yyyy-mm-dd')
order by cmsl.creation_time
</select>
</mapper>

10
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java
View File

@ -35,16 +35,6 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange {
*/
private String awardsName;
/**
* 是否相同日，注册日是累计升级
*/
private Integer sameDate;
/**
* 注册升级购买数量
*/
private Integer buyNum;
/**
* 极差比例
*/

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java
View File

@ -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;
/**
* <p>
* 办理业务记录信息表
* </p>
*
* @author hzs
* @since 2022-08-22
*/
@Data
@Builder