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

## 退单扣减业绩全部走首购；

This commit is contained in:
cabbage 2025-10-21 14:58:23 +08:00 committed by sangelxiu1
parent 87c555da59
commit cceb8d3aee
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,17 +166,20 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
.newRealAmount(BigDecimal.ZERO)
.newRealPv(BigDecimal.ZERO)
.build();
if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrder.getOrderType()) ||
Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrder.getOrderType()) ||
Objects.equals(EOrderType.FICTITIOUS_ORDER.getValue(), saOrder.getOrderType()) ||
Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrder.getOrderType()) ||
Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrder.getOrderType())) {
cuMemberAchieve.setNewAmount(saOrder.getOrderAmount());
cuMemberAchieve.setNewPv(saOrder.getOrderAchieve());
} else {
cuMemberAchieve.setRepNewAmount(saOrder.getOrderAmount());
cuMemberAchieve.setRepNewPv(saOrder.getOrderAchieve());
}
cuMemberAchieve.setNewAmount(saOrder.getOrderAmount());
cuMemberAchieve.setNewPv(saOrder.getOrderAchieve());
// if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrder.getOrderType()) ||
// Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrder.getOrderType()) ||
// Objects.equals(EOrderType.FICTITIOUS_ORDER.getValue(), saOrder.getOrderType()) ||
// Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrder.getOrderType()) ||
// Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrder.getOrderType())) {
// cuMemberAchieve.setNewAmount(saOrder.getOrderAmount());
// cuMemberAchieve.setNewPv(saOrder.getOrderAchieve());
// } else {
// cuMemberAchieve.setRepNewAmount(saOrder.getOrderAmount());
// cuMemberAchieve.setRepNewPv(saOrder.getOrderAchieve());
// }
String payTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrder.getPayTime());
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(payTime).getPkId();
String sourceTable = TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(payTime);