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

## Opt - 重写左右区结余逻辑

This commit is contained in:
sangelxiu1 2025-10-22 14:16:30 +08:00
parent 6ffbb4ad50
commit 774f542df6
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.hzs.bonus.achieve.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberAchieveService;
import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
@ -205,6 +206,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
if(ObjectUtil.isEmpty(baseSettleVO)){ if(ObjectUtil.isEmpty(baseSettleVO)){
return; return;
} }
log.info("processBalance saOrder : {}", JSONUtil.toJsonStr(saOrder));
BigDecimal pendingPV = cuMemberAchieve.getNewPv(); BigDecimal pendingPV = cuMemberAchieve.getNewPv();
// 排除本人的上级网体修改列表 // 排除本人的上级网体修改列表
List<CuMemberSettleVO> updateMemberSettleVOList = new ArrayList<>(); List<CuMemberSettleVO> updateMemberSettleVOList = new ArrayList<>();
@ -218,7 +220,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
.build(); .build();
updateMemberSettleVOList.add(updateVO); updateMemberSettleVOList.add(updateVO);
assert baseSettleVO != null; assert baseSettleVO != null;
if(EPlaceDept.LEFT_DEPT.getValue() == baseSettleVO.getPlaceDep()){ log.info("processBalance baseSettleVO : {}", JSONUtil.toJsonStr(baseSettleVO));
if(EPlaceDept.LEFT_DEPT.getValue() == baseSettleVO.getPlaceDept()){
BigDecimal aBalance = nowSettleVO.getABalance(); BigDecimal aBalance = nowSettleVO.getABalance();
BigDecimal result = aBalance.subtract(pendingPV); BigDecimal result = aBalance.subtract(pendingPV);
if (result.compareTo(BigDecimal.ZERO) >= 0) { if (result.compareTo(BigDecimal.ZERO) >= 0) {

2
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java
View File

@ -16,7 +16,7 @@ public class CuMemberSettleVO implements Serializable {
private Integer level; private Integer level;
private Long pkMember; private Long pkMember;
private Long pkParent; private Long pkParent;
private Integer placeDep; private Integer placeDept;
private String memberCode; private String memberCode;
private String memberName; private String memberName;
private Integer period; private Integer period;

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

@ -1327,9 +1327,16 @@
* *
FROM FROM
( (
SELECT LEVEL SELECT
, LEVEL,
cm.* cm.period,
cm.pk_member as pkMember,
cm.pk_parent as pkParent,
cm.place_Dept as placeDept,
cm.member_Code as memberCode,
cm.member_Name as memberName,
cm.a_Balance as aBalance,
cm.b_Balance as bBalance
FROM FROM
${targetTable} cm START WITH cm.pk_member = #{pkMember} CONNECT BY cm.PK_MEMBER = PRIOR cm.PK_PARENT ${targetTable} cm START WITH cm.pk_member = #{pkMember} CONNECT BY cm.PK_MEMBER = PRIOR cm.PK_PARENT
ORDER BY ORDER BY