angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 注册、升级、复购等添加秒结业绩处理；188安置关系按实时业绩左右区进行安置；

This commit is contained in:
cabbage 2025-07-21 17:28:36 +08:00
parent f31110ff50
commit 305117aba6
19 changed files with 205 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java
View File

@ -87,9 +87,4 @@ public class BonusConfigDTO implements Serializable {
*/ */
private Map<String, BdBonusService> bonusServiceMap; private Map<String, BdBonusService> bonusServiceMap;
/**
* 云代奖金 需要主键 国家+收益类型
*/
private Map<String, BdBonusCloud> bonusCloudMap;
} }

12
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleAgentHandle.java
View File

@ -1,12 +0,0 @@
package com.hzs.bonus.bonus.service.impl;
import org.springframework.stereotype.Component;
/**
* 计算云代奖金
*/
@Component
public class BonusSettleAgentHandle extends BonusSettleHandle {
}

3
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
View File

@ -1153,8 +1153,9 @@ public abstract class BonusSettleHandle {
} }
/** /**
* 根据订单分类，分为首购、复购、真实，获取新增业绩
*
* @param orderExtList 订单列表 * @param orderExtList 订单列表
* @Description: 根据订单分类，分为首购、复购、真实，获取新增业绩
*/ */
public void assortSaOrder(Map<Long, MemberAchieveParam> cuMemberAchieveHashMap, List<SaOrderExt> orderExtList, public void assortSaOrder(Map<Long, MemberAchieveParam> cuMemberAchieveHashMap, List<SaOrderExt> orderExtList,
BonusConfigDTO bonusConfigDTO, Boolean isFirst) { BonusConfigDTO bonusConfigDTO, Boolean isFirst) {

12
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHiFunHandle.java
View File

@ -1,12 +0,0 @@
package com.hzs.bonus.bonus.service.impl;
import org.springframework.stereotype.Component;
/**
* 计算嗨粉订单
*/
@Component
public class BonusSettleHiFunHandle extends BonusSettleHandle {
}

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -172,7 +172,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
} }
/** /**
* @Description: 秒接复购量奖 * 秒接复购量奖
*
* @return: List<CuMemberBonusExpand> * @return: List<CuMemberBonusExpand>
*/ */
protected List<CuMemberBonusExpand> calculateRepurchaseExpandSecondBonus(Map<Long, CuMemberRiskControl> riskControlMap, String settleTableName, Map<Long, CuMemberSettleExt> cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, protected List<CuMemberBonusExpand> calculateRepurchaseExpandSecondBonus(Map<Long, CuMemberRiskControl> riskControlMap, String settleTableName, Map<Long, CuMemberSettleExt> cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO,
@ -185,7 +186,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
} }
/** /**
* @Description: 秒接复购量奖 * 秒接复购量奖
*
* @return: List<CuMemberBonusExpand> * @return: List<CuMemberBonusExpand>
*/ */
protected List<CuMemberBonusPush> calculateRepurchasePushSecondBonus(String settleTableName, Map<Long, CuMemberSettleExt> cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, Integer period, protected List<CuMemberBonusPush> calculateRepurchasePushSecondBonus(String settleTableName, Map<Long, CuMemberSettleExt> cuMemberSettleExtMap, BonusConfigDTO bonusConfigDTO, Integer period,

264
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -139,10 +139,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
@Autowired @Autowired
private BonusSettleNewExpandHandle bonusSettleNewExpandHandle; private BonusSettleNewExpandHandle bonusSettleNewExpandHandle;
@Autowired @Autowired
private BonusSettleHiFunHandle bonusSettleHiFunHandle;
@Autowired
private BonusSettleAgentHandle bonusSettleAgentHandle;
@Autowired
private BonusSettleRepCouponsHandle bonusSettleRepCouponsHandle; private BonusSettleRepCouponsHandle bonusSettleRepCouponsHandle;
@Autowired @Autowired
private BonusSettleMallHandle bonusSettleMallHandle; private BonusSettleMallHandle bonusSettleMallHandle;
@ -155,27 +151,34 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
public void calculateCumberBonusBySecond(String orderCode) { public void calculateCumberBonusBySecond(String orderCode) {
log.info("开始执行秒接，订单编号：{}", orderCode); log.info("开始执行秒接，订单编号：{}", orderCode);
Date startDate = DateUtils.currentDate(); Date startDate = DateUtils.currentDate();
SaOrderExt saOrderExt = iSaOrderServiceApi.querySaOrderByDay(startDate, SaOrderExt saOrderExt = iSaOrderServiceApi.querySaOrderByDay(startDate, DateUtils.afterDate(1, ChronoUnit.DAYS, startDate), orderCode).getData();
DateUtils.afterDate(1, ChronoUnit.DAYS, startDate), orderCode).getData(); log.info("查询订单，订单参数：{}", JSONUtil.toJsonStr(saOrderExt));
Map<String, String> systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData(); Map<String, String> systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData();
Map<String, RangeDTO> rangeDtoMap = iRangeServiceApi.queryRangeDto().getData(); Map<String, RangeDTO> rangeDtoMap = iRangeServiceApi.queryRangeDto().getData();
// 处理奖金结算秒结表，判断是否存在当天结算的秒接表，从cu_member中获取网体，从昨日结算表中获取累计、结余数据 // 处理奖金结算秒结表，判断是否存在当天结算的秒接表，从cu_member中获取网体，从昨日结算表中获取累计、结余数据
String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrderExt.getPayTime()); String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrderExt.getPayTime());
String beforeDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, saOrderExt.getPayTime())); String beforeDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, saOrderExt.getPayTime()));
String beforeYesDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(2, ChronoUnit.DAYS, saOrderExt.getPayTime())); String beforeYesDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(2, ChronoUnit.DAYS, saOrderExt.getPayTime()));
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId();
int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDay).getPkId(); int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDay).getPkId();
int beforeYesPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeYesDay).getPkId(); int beforeYesPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeYesDay).getPkId();
log.info("查询订单，订单参数：{}", JSONUtil.toJsonStr(saOrderExt));
// 今天秒结表
String secondTableName = TableNameConstants.CU_MEMBER_SECOND + period; String secondTableName = TableNameConstants.CU_MEMBER_SECOND + period;
// 昨天日结表
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod; String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod;
// 前天 // 前天日结表
String yesSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforeYesPeriod; String yesSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforeYesPeriod;
Map<Long, CuMemberBonus> cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); Map<Long, CuMemberBonus> cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM);
BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData();
Map<Long, CuMemberSettleExt> cuMemberSettleExtMap = new HashMap<>(); Map<Long, CuMemberSettleExt> cuMemberSettleExtMap = new HashMap<>();
Map<Long, CuAwardsControl> cuAwardsControlMap = getCuAwardsControlMap(); Map<Long, CuAwardsControl> cuAwardsControlMap = getCuAwardsControlMap();
List<BdAwards> awardsList = iAwardsServiceApi.queryAwards(saOrderExt.getPkCountry()).getData(); List<BdAwards> awardsList = iAwardsServiceApi.queryAwards(saOrderExt.getPkCountry()).getData();
// 计算奖金 // 计算奖金
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType() || if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType() ||
EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType() || EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType() ||
@ -195,117 +198,176 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
memberList.add(cuMember.getPkCenterCode()); memberList.add(cuMember.getPkCenterCode());
} }
getSettleMember(saOrderExt, secondTableName, settleTableName, yesSettleTableName, memberList); getSettleMember(saOrderExt, secondTableName, settleTableName, yesSettleTableName, memberList);
// 查询出上面的网体数据 // 查询出上面的网体数据（推荐）
List<CuMemberSettleExt> cuMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondParent(secondTableName, memberList); List<CuMemberSettleExt> cuMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondParent(secondTableName, memberList);
bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList); bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList);
// 计算奖金
// 计算直推奖 // 所有需要计算的父节点（安置），只计算新增
List<GradeDTO> gradeDtoList = iGradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData();
CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, iAwardsServiceApi.getAwards().getData(), gradeDtoList);
log.info("获得直推奖，奖金为：{}", JSONUtil.toJsonStr(cuMemberBonusPush));
// 计算量奖
// 所有需要计算的父节点，只计算新增
List<CuMemberSettleExt> expandMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember()); List<CuMemberSettleExt> expandMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember());
bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, expandMemberSettleExtList); bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, expandMemberSettleExtList);
Map<Long, CuMemberBonus> weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period); for (CuMemberSettleExt cuMemberSettleExt : expandMemberSettleExtList) {
Map<Long, CuMemberAssess> cuMemberAssessMap = bonusSettleFirstPurchaseHandle.getLongCuMemberAssessMap(settleDate, expandMemberSettleExtList); // 数据已经准备好了，肯定有值，map中是实际的值，先计算新增，然后根据新增结算计算碰次，list是为了存储碰次的顺序
// 查询K值控制 CuMemberSettleExt targetMemberSettleExt = cuMemberSettleExtMap.get(cuMemberSettleExt.getPkPlaceParent());
List<CuMemberRiskControl> cuMemberRiskControlList = iCuMemberRiskControlService.queryCuMemberRiskControl(DateUtils.parseStringToDate(settleDate)); if (null == targetMemberSettleExt
Map<Long, CuMemberRiskControl> riskControlMap = new HashMap<>(); || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
if (CollectionUtil.isNotEmpty(cuMemberRiskControlList)) { || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus()
cuMemberRiskControlList.forEach(cuMemberRiskControl -> riskControlMap.put(cuMemberRiskControl.getPkMember(), cuMemberRiskControl)); || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) {
} // 会员不满足计算奖金条件，跳过
Map<Long, CuBonusExpandExt> cuBonusExpandExtMap = new HashMap<>(); continue;
BonusExpandParam bonusExpandParam = BonusExpandParam.builder().settleDate(DateUtils.parseStringToDate(settleDate)).build(); }
List<CuBonusExpandExt> cuBonusExpandExtList = iCuBonusExpandService.queryBonusExpand(bonusExpandParam); if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) {
cuBonusExpandExtList.forEach(cuBonusExpandExt -> cuBonusExpandExtMap.put(cuBonusExpandExt.getPkMember(), cuBonusExpandExt)); // 左区
BigDecimal addTouch = BigDecimal.ZERO; targetMemberSettleExt.setANewAmount(ComputeUtil.computeAdd(targetMemberSettleExt.getANewAmount(), saOrderExt.getOrderAmount()));
for (int i = expandMemberSettleExtList.size() - 1; i >= 0; i--) { targetMemberSettleExt.setANewPv(ComputeUtil.computeAdd(targetMemberSettleExt.getANewPv(), saOrderExt.getUploadAchieve()));
CuMemberSettleExt cuMemberSettleExt = cuMemberSettleExtList.get(i); targetMemberSettleExt.setABalance(ComputeUtil.computeAdd(targetMemberSettleExt.getABalance(), saOrderExt.getUploadAchieve()));
if (cuBonusExpandExtMap.containsKey(cuMemberSettleExt.getPkMember())) { } else {
addTouch = cuBonusExpandExtMap.get(cuMemberSettleExt.getPkMember()).getAddTouch(); // 右区
break; targetMemberSettleExt.setBNewAmount(ComputeUtil.computeAdd(targetMemberSettleExt.getBNewAmount(), saOrderExt.getOrderAmount()));
targetMemberSettleExt.setBNewPv(ComputeUtil.computeAdd(targetMemberSettleExt.getBNewPv(), saOrderExt.getUploadAchieve()));
targetMemberSettleExt.setBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getBBalance(), saOrderExt.getUploadAchieve()));
} }
} }
List<CuMemberBonusExpand> cuMemberBonusExpandList = bonusSettleFirstPurchaseHandle.calculateExpandBonusOne(riskControlMap, cuMemberAssessMap, settleTableName, cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, expandMemberSettleExtList, saOrderExt, false, addTouch, BigDecimal.ZERO, 0);
// 计算领导奖
Map<Long, SaOrderExt> saOrderExtMap = new HashMap<>(1);
saOrderExtMap.put(saOrderExt.getPkId(), saOrderExt);
// 领导奖现在首购、复购都有，此处需要传入参数区分 // // 计算奖金
boolean firstFlag = EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrderExt.getOrderType() // // 计算直推奖
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType(); // List<GradeDTO> gradeDtoList = iGradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData();
// 领导奖处理 // CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, iAwardsServiceApi.getAwards().getData(), gradeDtoList);
List<CuMemberBonusCoach> cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonusOne(cuMemberSettleExtMap, settleTableName, settleDate, bonusConfigDTO, // log.info("获得直推奖，奖金为：{}", JSONUtil.toJsonStr(cuMemberBonusPush));
cuMemberBonusExpandList, period, cuMemberBonusMap, saOrderExtMap, cuAwardsControlMap, riskControlMap, awardsList, firstFlag, false); // // 计算量奖
// // 所有需要计算的父节点，只计算新增
// 计算报单服务费 // List<CuMemberSettleExt> expandMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember());
CuMemberBonusDetail cuMemberBonusDetail = bonusSettleFirstPurchaseHandle.calculateServiceBonusOne(settleDate, cuMemberAssessMap, cuMemberSettleExtMap, bonusConfigDTO, period, cuMemberBonusMap, saOrderExt); // bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, expandMemberSettleExtList);
// 复购券 // Map<Long, CuMemberBonus> weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period);
List<CuMemberBonusDetail> couponsBonusDetailList = bonusSettleRepCouponsHandle.calculateRepurchaseCoupons(startDate, Collections.singletonList(saOrderExt), period, bonusConfigDTO, cuMemberBonusMap, cuMemberSettleExtMap); // Map<Long, CuMemberAssess> cuMemberAssessMap = bonusSettleFirstPurchaseHandle.getLongCuMemberAssessMap(settleDate, expandMemberSettleExtList);
saveCuMemberBonus(period, settleDate, cuMemberBonusMap); // // 查询K值控制
cuMemberBonusPush.setPkBonus(cuMemberBonusMap.get(cuMemberBonusPush.getPkBonus()).getPkId()); // List<CuMemberRiskControl> cuMemberRiskControlList = iCuMemberRiskControlService.queryCuMemberRiskControl(DateUtils.parseStringToDate(settleDate));
Set<Long> memberIdSet = iCuMemberBonusService.queryMemberBonusByPeriod(period); // Map<Long, CuMemberRiskControl> riskControlMap = new HashMap<>();
iCuMemberBonusPushService.insertCuMemberBonusPush(cuMemberBonusPush); // if (CollectionUtil.isNotEmpty(cuMemberRiskControlList)) {
cuMemberBonusExpandList.forEach(cuMemberBonusExpand -> // cuMemberRiskControlList.forEach(cuMemberRiskControl -> riskControlMap.put(cuMemberRiskControl.getPkMember(), cuMemberRiskControl));
cuMemberBonusExpand.setPkBonus(cuMemberBonusMap.get(cuMemberBonusExpand.getPkBonus()).getPkId())); // }
iCuMemberBonusExpandService.batchInsertCuMemberBonusExpand(cuMemberBonusExpandList, memberIdSet); // Map<Long, CuBonusExpandExt> cuBonusExpandExtMap = new HashMap<>();
// BonusExpandParam bonusExpandParam = BonusExpandParam.builder().settleDate(DateUtils.parseStringToDate(settleDate)).build();
cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> // List<CuBonusExpandExt> cuBonusExpandExtList = iCuBonusExpandService.queryBonusExpand(bonusExpandParam);
cuMemberBonusCoach.setPkBonus(cuMemberBonusMap.get(cuMemberBonusCoach.getPkBonus()).getPkId())); // cuBonusExpandExtList.forEach(cuBonusExpandExt -> cuBonusExpandExtMap.put(cuBonusExpandExt.getPkMember(), cuBonusExpandExt));
iCuMemberBonusCoachService.batchInsertCuMemberBonusCoach(cuMemberBonusCoachList, memberIdSet); // BigDecimal addTouch = BigDecimal.ZERO;
// for (int i = expandMemberSettleExtList.size() - 1; i >= 0; i--) {
List<CuMemberBonusDetail> cuMemberBonusDetailList = new ArrayList<>(); // CuMemberSettleExt cuMemberSettleExt = cuMemberSettleExtList.get(i);
if (cuMemberBonusDetail != null) { // if (cuBonusExpandExtMap.containsKey(cuMemberSettleExt.getPkMember())) {
cuMemberBonusDetailList.add(cuMemberBonusDetail); // addTouch = cuBonusExpandExtMap.get(cuMemberSettleExt.getPkMember()).getAddTouch();
} // break;
if (CollectionUtil.isNotEmpty(couponsBonusDetailList)) { // }
cuMemberBonusDetailList.addAll(couponsBonusDetailList); // }
} // // 计算首购量奖
if (cuMemberBonusDetailList.size() > 0) { // List<CuMemberBonusExpand> cuMemberBonusExpandList = bonusSettleFirstPurchaseHandle.calculateExpandBonusOne(riskControlMap, cuMemberAssessMap, settleTableName, cuMemberSettleExtMap,
cuMemberBonusDetailList.forEach(bonusDetail -> // bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, expandMemberSettleExtList, saOrderExt, false, addTouch, BigDecimal.ZERO, 0);
bonusDetail.setPkBonus(cuMemberBonusMap.get(bonusDetail.getPkBonus()).getPkId())); // // 计算领导奖
iCuMemberBonusDetailService.batchInsertCuMemberBonusDetail(cuMemberBonusDetailList, memberIdSet); // Map<Long, SaOrderExt> saOrderExtMap = new HashMap<>(1);
} // saOrderExtMap.put(saOrderExt.getPkId(), saOrderExt);
//
// // 领导奖现在首购、复购都有，此处需要传入参数区分
// boolean firstFlag = EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
// || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType();
// // 领导奖处理
// List<CuMemberBonusCoach> cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonusOne(cuMemberSettleExtMap, settleTableName, settleDate, bonusConfigDTO,
// cuMemberBonusExpandList, period, cuMemberBonusMap, saOrderExtMap, cuAwardsControlMap, riskControlMap, awardsList, firstFlag, false);
//
// // 计算报单服务费
// CuMemberBonusDetail cuMemberBonusDetail = bonusSettleFirstPurchaseHandle.calculateServiceBonusOne(settleDate, cuMemberAssessMap, cuMemberSettleExtMap, bonusConfigDTO, period, cuMemberBonusMap, saOrderExt);
// // 复购券
// List<CuMemberBonusDetail> couponsBonusDetailList = bonusSettleRepCouponsHandle.calculateRepurchaseCoupons(startDate, Collections.singletonList(saOrderExt), period, bonusConfigDTO, cuMemberBonusMap, cuMemberSettleExtMap);
// saveCuMemberBonus(period, settleDate, cuMemberBonusMap);
// cuMemberBonusPush.setPkBonus(cuMemberBonusMap.get(cuMemberBonusPush.getPkBonus()).getPkId());
// Set<Long> memberIdSet = iCuMemberBonusService.queryMemberBonusByPeriod(period);
// iCuMemberBonusPushService.insertCuMemberBonusPush(cuMemberBonusPush);
// cuMemberBonusExpandList.forEach(cuMemberBonusExpand ->
// cuMemberBonusExpand.setPkBonus(cuMemberBonusMap.get(cuMemberBonusExpand.getPkBonus()).getPkId()));
// iCuMemberBonusExpandService.batchInsertCuMemberBonusExpand(cuMemberBonusExpandList, memberIdSet);
//
// cuMemberBonusCoachList.forEach(cuMemberBonusCoach ->
// cuMemberBonusCoach.setPkBonus(cuMemberBonusMap.get(cuMemberBonusCoach.getPkBonus()).getPkId()));
// iCuMemberBonusCoachService.batchInsertCuMemberBonusCoach(cuMemberBonusCoachList, memberIdSet);
//
// List<CuMemberBonusDetail> cuMemberBonusDetailList = new ArrayList<>();
// if (cuMemberBonusDetail != null) {
// cuMemberBonusDetailList.add(cuMemberBonusDetail);
// }
// if (CollectionUtil.isNotEmpty(couponsBonusDetailList)) {
// cuMemberBonusDetailList.addAll(couponsBonusDetailList);
// }
// if (cuMemberBonusDetailList.size() > 0) {
// cuMemberBonusDetailList.forEach(bonusDetail ->
// bonusDetail.setPkBonus(cuMemberBonusMap.get(bonusDetail.getPkBonus()).getPkId()));
// iCuMemberBonusDetailService.batchInsertCuMemberBonusDetail(cuMemberBonusDetailList, memberIdSet);
// }
log.info("首购奖金计算完毕"); log.info("首购奖金计算完毕");
} else { } else {
// 先处理关系 // 先处理关系
List<Long> memberList = new ArrayList<>(); List<Long> memberList = new ArrayList<>();
getSettleMember(saOrderExt, secondTableName, yesSettleTableName, settleTableName, memberList); getSettleMember(saOrderExt, secondTableName, yesSettleTableName, settleTableName, memberList);
// 初始化需要秒接结算的数据 // 查询出上面的网体数据（推荐）
List<CuMemberSettleExt> pushMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondParent(secondTableName, memberList); List<CuMemberSettleExt> pushMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondParent(secondTableName, memberList);
bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, pushMemberSettleExtList); bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, pushMemberSettleExtList);
List<CuMemberBonusPush> cuMemberBonusPushList = bonusSettlePurchaseHandle.calculateRepurchasePushSecondBonus(settleTableName, cuMemberSettleExtMap, bonusConfigDTO, period, cuMemberBonusMap, saOrderExt, pushMemberSettleExtList, settleDate);
// 查询出上面的网体数据 // 查询出上面的网体数据
List<CuMemberSettleExt> cuMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember()); List<CuMemberSettleExt> cuMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember());
bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList); bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList);
Map<Long, CuMemberBonus> weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period);
// 复购订单，计算复购推荐 复购极差，复购拓展 // 所有需要计算的父节点（安置），只计算新增
// 查询K值控制 List<CuMemberSettleExt> expandMemberSettleExtList = iCuMemberTreeService.queryCuMemberSecondPlaceParent(secondTableName, saOrderExt.getPkMember());
List<CuMemberRiskControl> cuMemberRiskControlList = iCuMemberRiskControlService.queryCuMemberRiskControl(DateUtils.parseStringToDate(settleDate)); bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, expandMemberSettleExtList);
Map<Long, CuMemberRiskControl> riskControlMap = new HashMap<>(); for (CuMemberSettleExt cuMemberSettleExt : expandMemberSettleExtList) {
if (CollectionUtil.isNotEmpty(cuMemberRiskControlList)) { // 数据已经准备好了，肯定有值，map中是实际的值，先计算新增，然后根据新增结算计算碰次，list是为了存储碰次的顺序
cuMemberRiskControlList.forEach(cuMemberRiskControl -> riskControlMap.put(cuMemberRiskControl.getPkMember(), cuMemberRiskControl)); CuMemberSettleExt targetMemberSettleExt = cuMemberSettleExtMap.get(cuMemberSettleExt.getPkPlaceParent());
} if (null == targetMemberSettleExt
List<CuMemberBonusExpand> cuMemberBonusExpandList = bonusSettlePurchaseHandle.calculateRepurchaseExpandSecondBonus(riskControlMap, settleTableName, || ECategory.NORMAL.getValue() != targetMemberSettleExt.getCategory()
cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, saOrderExt, cuMemberSettleExtList, settleDate, BigDecimal.ZERO, BigDecimal.ZERO, 0); || EAccountStatus.STOP_INCOME.getValue() == targetMemberSettleExt.getAccountStatus()
// c)增加奖衔记录表 || EGrade.START_UP.getValue() == targetMemberSettleExt.getGradeValue()) {
Map<String, BdAwards> awardsMap = iAwardsServiceApi.getAwards().getData(); // 会员不满足计算奖金条件，跳过
List<CuMemberBonusRange> cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap, continue;
bonusConfigDTO, Collections.singletonList(saOrderExt), period, cuMemberBonusMap, cuAwardsControlMap); }
if (cuMemberBonusMap.size() > 0) { if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) {
saveCuMemberBonus(period, settleDate, cuMemberBonusMap); // 左区
Set<Long> memberIdSet = iCuMemberBonusService.queryMemberBonusByPeriod(period); targetMemberSettleExt.setANewAmount(ComputeUtil.computeAdd(targetMemberSettleExt.getANewAmount(), saOrderExt.getOrderAmount()));
cuMemberBonusPushList.forEach(cuMemberBonusPush -> targetMemberSettleExt.setANewPv(ComputeUtil.computeAdd(targetMemberSettleExt.getANewPv(), saOrderExt.getUploadAchieve()));
cuMemberBonusPush.setPkBonus(cuMemberBonusMap.get(cuMemberBonusPush.getPkBonus()).getPkId())); targetMemberSettleExt.setABalance(ComputeUtil.computeAdd(targetMemberSettleExt.getABalance(), saOrderExt.getUploadAchieve()));
iCuMemberBonusPushService.batchInsertCuMemberBonusPush(cuMemberBonusPushList, memberIdSet); } else {
cuMemberBonusExpandList.forEach(cuMemberBonusExpand -> // 右区
cuMemberBonusExpand.setPkBonus(cuMemberBonusMap.get(cuMemberBonusExpand.getPkBonus()).getPkId())); targetMemberSettleExt.setBNewAmount(ComputeUtil.computeAdd(targetMemberSettleExt.getBNewAmount(), saOrderExt.getOrderAmount()));
iCuMemberBonusExpandService.batchInsertCuMemberBonusExpand(cuMemberBonusExpandList, memberIdSet); targetMemberSettleExt.setBNewPv(ComputeUtil.computeAdd(targetMemberSettleExt.getBNewPv(), saOrderExt.getUploadAchieve()));
cuMemberBonusRangeList.forEach(cuMemberBonusRange -> targetMemberSettleExt.setBBalance(ComputeUtil.computeAdd(targetMemberSettleExt.getBBalance(), saOrderExt.getUploadAchieve()));
cuMemberBonusRange.setPkBonus(cuMemberBonusMap.get(cuMemberBonusRange.getPkBonus()).getPkId())); }
iCuMemberBonusRangeService.batchInsertCuMemberBonusRange(cuMemberBonusRangeList, memberIdSet);
} }
// // 秒接复购量奖
// List<CuMemberBonusPush> cuMemberBonusPushList = bonusSettlePurchaseHandle.calculateRepurchasePushSecondBonus(settleTableName, cuMemberSettleExtMap,
// bonusConfigDTO, period, cuMemberBonusMap, saOrderExt, pushMemberSettleExtList, settleDate);
// Map<Long, CuMemberBonus> weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period);
// // 复购订单，计算复购推荐 复购极差，复购拓展
// // 查询K值控制
// List<CuMemberRiskControl> cuMemberRiskControlList = iCuMemberRiskControlService.queryCuMemberRiskControl(DateUtils.parseStringToDate(settleDate));
// Map<Long, CuMemberRiskControl> riskControlMap = new HashMap<>();
// if (CollectionUtil.isNotEmpty(cuMemberRiskControlList)) {
// cuMemberRiskControlList.forEach(cuMemberRiskControl -> riskControlMap.put(cuMemberRiskControl.getPkMember(), cuMemberRiskControl));
// }
// // 计算复购量奖
// List<CuMemberBonusExpand> cuMemberBonusExpandList = bonusSettlePurchaseHandle.calculateRepurchaseExpandSecondBonus(riskControlMap, settleTableName,
// cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, saOrderExt, cuMemberSettleExtList, settleDate, BigDecimal.ZERO, BigDecimal.ZERO, 0);
// // c)增加奖衔记录表
// Map<String, BdAwards> awardsMap = iAwardsServiceApi.getAwards().getData();
// List<CuMemberBonusRange> cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap,
// bonusConfigDTO, Collections.singletonList(saOrderExt), period, cuMemberBonusMap, cuAwardsControlMap);
// if (cuMemberBonusMap.size() > 0) {
// saveCuMemberBonus(period, settleDate, cuMemberBonusMap);
// Set<Long> memberIdSet = iCuMemberBonusService.queryMemberBonusByPeriod(period);
// cuMemberBonusPushList.forEach(cuMemberBonusPush ->
// cuMemberBonusPush.setPkBonus(cuMemberBonusMap.get(cuMemberBonusPush.getPkBonus()).getPkId()));
// iCuMemberBonusPushService.batchInsertCuMemberBonusPush(cuMemberBonusPushList, memberIdSet);
// cuMemberBonusExpandList.forEach(cuMemberBonusExpand ->
// cuMemberBonusExpand.setPkBonus(cuMemberBonusMap.get(cuMemberBonusExpand.getPkBonus()).getPkId()));
// iCuMemberBonusExpandService.batchInsertCuMemberBonusExpand(cuMemberBonusExpandList, memberIdSet);
// cuMemberBonusRangeList.forEach(cuMemberBonusRange ->
// cuMemberBonusRange.setPkBonus(cuMemberBonusMap.get(cuMemberBonusRange.getPkBonus()).getPkId()));
// iCuMemberBonusRangeService.batchInsertCuMemberBonusRange(cuMemberBonusRangeList, memberIdSet);
// }
log.info("复购奖金计算完毕"); log.info("复购奖金计算完毕");
} }
// 更新网体结构 // 更新网体结构

9
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java
View File

@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
public class SaOrderSecondListener { public class SaOrderSecondListener {
@Autowired @Autowired
private IBonusSettleService bonusSettleService; private IBonusSettleService iBonusSettleService;
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(value = RabbitMqConstants.ORDER_SECOND_EXCHANGE, type = "topic"), exchange = @Exchange(value = RabbitMqConstants.ORDER_SECOND_EXCHANGE, type = "topic"),
@ -28,13 +28,14 @@ public class SaOrderSecondListener {
@RabbitHandler @RabbitHandler
public void onMessage(Message<SaOrderExt> message, Channel channel) throws Exception { public void onMessage(Message<SaOrderExt> message, Channel channel) throws Exception {
SaOrderExt saOrderExt = message.getPayload(); SaOrderExt saOrderExt = message.getPayload();
log.info("秒结开始消费，接收到的参数：{}", saOrderExt.getOrderCode());
Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
channel.basicAck(deliveryTag, false); channel.basicAck(deliveryTag, false);
log.info("秒结开始消费，接收到的参数：{}", saOrderExt.getOrderCode());
try { try {
Thread.sleep(500); Thread.sleep(500);
// 订单当日订单只计算奖衔 iBonusSettleService.calculateCumberBonusBySecond(saOrderExt.getOrderCode());
bonusSettleService.calculateCumberBonusBySecond(saOrderExt.getOrderCode());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

11
bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
View File

@ -593,21 +593,22 @@
<update id="updateCuMemberSecondPlaceParent"> <update id="updateCuMemberSecondPlaceParent">
merge into ${secondTableName} a merge into ${secondTableName} a
using ( using (
select B.pk_id,b.pk_settle_country pk_country,nvl(st.A_BALANCE,0) A_BALANCE,nvl(st.B_BALANCE,0) B_BALANCE, select B.pk_id, b.pk_settle_country pk_country,
nvl(st.A_BALANCE, 0) A_BALANCE, nvl(st.B_BALANCE, 0) B_BALANCE,
nvl(yt.A_SUM_AMOUNT,0) A_SUM_AMOUNT,nvl(yt.B_SUM_AMOUNT,0) B_SUM_AMOUNT, nvl(yt.A_SUM_AMOUNT,0) A_SUM_AMOUNT,nvl(yt.B_SUM_AMOUNT,0) B_SUM_AMOUNT,
nvl(yt.A_SUM_PV,0) A_SUM_PV,nvl(yt.b_SUM_PV,0) b_SUM_PV,nvl(st.A_NEW_AMOUNT,0) A_NEW_AMOUNT, nvl(yt.A_SUM_PV,0) A_SUM_PV,nvl(yt.b_SUM_PV,0) b_SUM_PV,nvl(st.A_NEW_AMOUNT,0) A_NEW_AMOUNT,
nvl(st.B_NEW_AMOUNT,0) B_NEW_AMOUNT,nvl(st.A_NEW_PV,0) A_NEW_PV, nvl(st.B_NEW_AMOUNT,0) B_NEW_AMOUNT,nvl(st.A_NEW_PV,0) A_NEW_PV,
nvl(ST.B_NEW_PV,0) B_NEW_PV,nvl(yt.A_SUM_REAL_AMOUNT,0) A_SUM_REAL_AMOUNT, nvl(ST.B_NEW_PV,0) B_NEW_PV,nvl(yt.A_SUM_REAL_AMOUNT,0) A_SUM_REAL_AMOUNT,
nvl(yt.B_SUM_REAL_AMOUNT,0) B_SUM_REAL_AMOUNT, nvl(yt.B_SUM_REAL_AMOUNT,0) B_SUM_REAL_AMOUNT,
nvl(yt.A_SUM_REAL_PV,0) A_SUM_REAL_PV, nvl(yt.A_SUM_REAL_PV,0) a_sum_real_pv, nvl(yt.B_SUM_REAL_PV,0) b_sum_real_pv,
nvl(yt.B_SUM_REAL_PV,0) B_SUM_REAL_PV,
nvl(ST.REP_A_BALANCE,0) REP_A_BALANCE,nvl(ST.REP_B_BALANCE,0) REP_B_BALANCE, nvl(ST.REP_A_BALANCE,0) REP_A_BALANCE,nvl(ST.REP_B_BALANCE,0) REP_B_BALANCE,
nvl(ST.REP_A_NEW_AMOUNT,0) REP_A_NEW_AMOUNT, nvl(ST.REP_A_NEW_AMOUNT,0) REP_A_NEW_AMOUNT,
nvl(ST.REP_B_NEW_AMOUNT,0) REP_B_NEW_AMOUNT,nvl(ST.REP_A_NEW_PV,0) REP_A_NEW_PV, nvl(ST.REP_B_NEW_AMOUNT,0) REP_B_NEW_AMOUNT,nvl(ST.REP_A_NEW_PV,0) REP_A_NEW_PV,
nvl(ST.REP_B_NEW_PV,0) REP_B_NEW_PV,nvl(yt.REP_A_SUM_AMOUNT,0) REP_A_SUM_AMOUNT, nvl(ST.REP_B_NEW_PV,0) REP_B_NEW_PV,nvl(yt.REP_A_SUM_AMOUNT,0) REP_A_SUM_AMOUNT,
nvl(yt.REP_B_SUM_AMOUNT,0) REP_B_SUM_AMOUNT,nvl(yt.REP_A_SUM_PV,0) REP_A_SUM_PV, nvl(yt.REP_B_SUM_AMOUNT,0) REP_B_SUM_AMOUNT,nvl(yt.REP_A_SUM_PV,0) REP_A_SUM_PV,
nvl(yt.REP_B_SUM_PV,0) REP_B_SUM_PV, nvl(yt.REP_B_SUM_PV,0) REP_B_SUM_PV,
nvl(ST.ROUND,0) ROUND,nvl(nvl(ST.SECOND,yt.second),1) SECOND,nvl(ST.MIN_ACHIEVE,0) MIN_ACHIEVE,b.expire_status nvl(ST.ROUND,0) ROUND,nvl(nvl(ST.SECOND,yt.second),1) SECOND,nvl(ST.MIN_ACHIEVE,0) MIN_ACHIEVE,
b.expire_status
from from
(select t.pk_id,t.pk_settle_country,t.expire_status from cu_member t (select t.pk_id,t.pk_settle_country,t.expire_status from cu_member t
where t.del_flag = 0 start with t.pk_id = #{pkMember} where t.del_flag = 0 start with t.pk_id = #{pkMember}
@ -628,7 +629,7 @@
left join ${secondTableName} st left join ${secondTableName} st
on b.pk_id = st.pk_member on b.pk_id = st.pk_member
left join ${settleTableName} yt left join ${settleTableName} yt
on b.pk_id=yt.pk_member on b.pk_id = yt.pk_member
) b ) b
on (a.pk_member = b.pk_id) on (a.pk_member = b.pk_id)
when matched then when matched then

4
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

@ -102,8 +102,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
String currentTableName = TableNameConstants.CU_MEMBER_SECOND + currentPeriod; String currentTableName = TableNameConstants.CU_MEMBER_SECOND + currentPeriod;
CuMemberAchieve cuMemberAchieve = baseMapper.queryCuMemberAchieveByPkMember(pkMember, pkCountry, currentTableName); CuMemberAchieve cuMemberAchieve = baseMapper.queryCuMemberAchieveByPkMember(pkMember, pkCountry, currentTableName);
if (cuMemberAchieve != null) { if (cuMemberAchieve != null) {
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv())) || if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv()))
ComputeUtil.compareValue(cuMemberAchieve.getRepASumPv(), cuMemberAchieve.getRepBSumPv())) { || ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumRealPv(), cuMemberAchieve.getBSumRealPv()))) {
return cuMemberAchieve; return cuMemberAchieve;
} }
} }

4
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
View File

@ -479,7 +479,7 @@ public class ApiMemberController extends BaseController {
} }
/** /**
* 查询推荐人编号 * 查询推荐人编号 -- 188分享注册
* *
* @param pkParent 推荐人（加密） * @param pkParent 推荐人（加密）
* @return * @return
@ -498,7 +498,7 @@ public class ApiMemberController extends BaseController {
} }
/** /**
* 根据订单查询会员信息 * 根据订单查询会员信息 -- 188分享注册
* *
* @param orderCode 订单编号 * @param orderCode 订单编号
* @return * @return

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -1275,9 +1275,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
placeDept = EPlaceDept.RIGHT_DEPT.getValue(); placeDept = EPlaceDept.RIGHT_DEPT.getValue();
} }
} else { } else {
// TODO 188判断左右区结余小区 // 188判断左右区真实业绩，放入小区
if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv()))) { if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumRealPv(), cuMemberAchieve.getBSumRealPv()))) {
if (ComputeUtil.compareValue(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv())) { if (ComputeUtil.compareValue(cuMemberAchieve.getASumRealPv(), cuMemberAchieve.getBSumRealPv())) {
placeDept = EPlaceDept.RIGHT_DEPT.getValue(); placeDept = EPlaceDept.RIGHT_DEPT.getValue();
} }
} else { } else {

2
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
View File

@ -90,7 +90,7 @@
REP_B_SUM_PV, REP_B_SUM_PV,
PK_COUNTRY PK_COUNTRY
FROM ${tableName} FROM ${tableName}
WHERE (pk_member = #{pkMember} AND pk_country = #{pkCountry}) WHERE pk_member = #{pkMember} AND pk_country = #{pkCountry}
</select> </select>
<select id="selectNewAddAchieve" resultType="com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO"> <select id="selectNewAddAchieve" resultType="com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO">

12
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -756,9 +756,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
try { try {
log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(saOrderExt)); log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
// //计算奖金，通过mq分发消息，异步处理 // 推送秒结数据处理 -- 注册订单
// log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt)); rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// // 推送会员续约处理MQ // // 推送会员续约处理MQ
@ -863,8 +862,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
throw new RuntimeException("保存会员失败!!!"); throw new RuntimeException("保存会员失败!!!");
} }
try { try {
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
// 推送秒结数据处理 -- 升级订单
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
// // 推送会员续约处理MQ // // 推送会员续约处理MQ
@ -953,6 +953,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
try { try {
// 推送秒结数据处理 -- 其它订单
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) {
// // 续约专区推送MQ // // 续约专区推送MQ
// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
@ -961,8 +963,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// .eMemberContinue(EMemberContinue.BUY_GIFT) // .eMemberContinue(EMemberContinue.BUY_GIFT)
// .build()); // .build());
// } // }
// // 推送秒结数据
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

9
bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java
View File

@ -1,17 +1,10 @@
package com.hzs.system.config.mapper; package com.hzs.system.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.system.config.BdBonusCloud; import com.hzs.common.domain.system.config.BdBonusCloud;
/** /**
* <p> * 云代配置 Mapper 接口
* 云代配置
Mapper 接口
* </p>
*
* @author zhangjing
* @since 2022-11-01
*/ */
public interface BdBonusCloudMapper extends BaseMapper<BdBonusCloud> { public interface BdBonusCloudMapper extends BaseMapper<BdBonusCloud> {

13
bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java
View File

@ -114,8 +114,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
bonusConfigDTO.setBonusDeductsMap(getBonusDeductConfig()); bonusConfigDTO.setBonusDeductsMap(getBonusDeductConfig());
// 报单服务费 // 报单服务费
bonusConfigDTO.setBonusServiceMap(getBonusServiceConfig()); bonusConfigDTO.setBonusServiceMap(getBonusServiceConfig());
// 云代奖金
bonusConfigDTO.setBonusCloudMap(getBonusCloudConfig());
return R.ok(bonusConfigDTO); return R.ok(bonusConfigDTO);
} }
@ -276,15 +274,4 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
return bdBonusDeductMap; return bdBonusDeductMap;
} }
/**
* 获取每个国家奖金项对应的扣项
*/
private Map<String, BdBonusCloud> getBonusCloudConfig() {
List<BdBonusCloud> bonusCloudList = bdBonusCloudService.queryBdBonusCloud();
Map<String, BdBonusCloud> bdBonusCloudHashMap = new HashMap<>(ComputeUtil.mapInitCapacity(bonusCloudList.size()));
bonusCloudList.forEach(bdBonusCloud ->
bdBonusCloudHashMap.put(bdBonusCloud.getPkCountry().toString() + bdBonusCloud.getCloudType(), bdBonusCloud));
return bdBonusCloudHashMap;
}
} }

32
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java
View File

@ -1,45 +1,21 @@
package com.hzs.system.config.service; package com.hzs.system.config.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.system.config.BdBonusCloud; import com.hzs.common.domain.system.config.BdBonusCloud;
import com.hzs.common.domain.system.config.ext.BdBonusCloudExt; import com.hzs.common.domain.system.config.ext.BdBonusCloudExt;
import java.util.List;
/** /**
* <p> * 云代配置 服务类
* 云代配置
服务类
* </p>
*
* @author zhangjing
* @since 2022-11-01
*/ */
public interface IBdBonusCloudService extends IService<BdBonusCloud> { public interface IBdBonusCloudService extends IService<BdBonusCloud> {
/*
* @description: 查询云代奖金配置
* @author: sui q
* @date: 2023/7/5 15:17
* @param: null null
**/
List<BdBonusCloud> queryBdBonusCloud();
/** /**
* @description: 新增云代配置 * 新增云代配置
* @author: zhang jing
* @date: 2022/11/1 17:13
* @param: [bonusCloudExt]
* @return: boolean
**/ **/
boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt); boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt);
/** /**
* @description: 修改云代配置 * 修改云代配置
* @author: zhang jing
* @date: 2022/11/1 17:13
* @param: [bonusCloudExt]
* @return: boolean
**/ **/
boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt); boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt);
} }

32
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.hzs.system.config.service.impl; package com.hzs.system.config.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.domain.system.config.BdBonusCloud; import com.hzs.common.domain.system.config.BdBonusCloud;
@ -11,43 +10,22 @@ import com.hzs.system.config.service.IBdBonusCloudService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* <p> * 云代配置 服务实现类
* 云代配置
服务实现类
* </p>
*
* @author zhangjing
* @since 2022-11-01
*/ */
@Service @Service
public class BdBonusCloudServiceImpl extends ServiceImpl<BdBonusCloudMapper, BdBonusCloud> implements IBdBonusCloudService { public class BdBonusCloudServiceImpl extends ServiceImpl<BdBonusCloudMapper, BdBonusCloud> implements IBdBonusCloudService {
@Override @Override
public List<BdBonusCloud> queryBdBonusCloud() {
QueryWrapper<BdBonusCloud> queryWrapper = new QueryWrapper<>();
queryWrapper.select("CLOUD_TYPE,CLOUD_RATIO,PK_COUNTRY");
return baseMapper.selectList(queryWrapper);
}
/**
* @description: 新增云代配置
* @author: zhang jing
* @date: 2022/11/1 17:11
* @param: [bonusCloudExt]
* @return: boolean
**/
@Override
public boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt) { public boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt) {
for(BdBonusCloud bonusCloud:bonusCloudExt.getBonusCloudList()){ for (BdBonusCloud bonusCloud : bonusCloudExt.getBonusCloudList()) {
bonusCloud.setPkCountry(SecurityUtils.getPkCountry()); bonusCloud.setPkCountry(SecurityUtils.getPkCountry());
if(StringUtils.isNotNull(bonusCloud.getPkId())){ if (StringUtils.isNotNull(bonusCloud.getPkId())) {
bonusCloud.setPkModified(SecurityUtils.getUserId()); bonusCloud.setPkModified(SecurityUtils.getUserId());
bonusCloud.setModifiedTime(new Date()); bonusCloud.setModifiedTime(new Date());
baseMapper.updateById(bonusCloud); baseMapper.updateById(bonusCloud);
}else{ } else {
bonusCloud.setPkCreator(SecurityUtils.getUserId()); bonusCloud.setPkCreator(SecurityUtils.getUserId());
bonusCloud.setCreationTime(new Date()); bonusCloud.setCreationTime(new Date());
baseMapper.insert(bonusCloud); baseMapper.insert(bonusCloud);
@ -58,7 +36,7 @@ public class BdBonusCloudServiceImpl extends ServiceImpl<BdBonusCloudMapper, BdB
@Override @Override
public boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt) { public boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt) {
for(BdBonusCloud bonusCloud:bonusCloudExt.getBonusCloudList()){ for (BdBonusCloud bonusCloud : bonusCloudExt.getBonusCloudList()) {
bonusCloud.setPkCountry(SecurityUtils.getPkCountry()); bonusCloud.setPkCountry(SecurityUtils.getPkCountry());
bonusCloud.setPkModified(SecurityUtils.getUserId()); bonusCloud.setPkModified(SecurityUtils.getUserId());
bonusCloud.setModifiedTime(new Date()); bonusCloud.setModifiedTime(new Date());

23
bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml
View File

@ -2,28 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.system.config.mapper.BdBonusCloudMapper"> <mapper namespace="com.hzs.system.config.mapper.BdBonusCloudMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdBonusCloud">
<id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" />
<result column="PK_COUNTRY" property="pkCountry" />
<result column="CREATION_TIME" property="creationTime" />
<result column="MODIFIED_TIME" property="modifiedTime" />
<result column="PK_CREATOR" property="pkCreator" />
<result column="PK_MODIFIED" property="pkModified" />
<result column="CLOUD_TYPE" property="cloudType" />
<result column="CLOUD_RATIO" property="cloudRatio" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
DEL_FLAG,
PK_COUNTRY,
CREATION_TIME,
MODIFIED_TIME,
PK_CREATOR,
PK_MODIFIED,
PK_ID, CLOUD_TYPE, CLOUD_RATIO
</sql>
</mapper> </mapper>

8
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java
View File

@ -14,13 +14,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* <p> * 云代配置
* 云代配置
* </p>
*
* @author zhangjing
* @since 2022-11-01
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)