## Opt - 重写左右区结余逻辑(调整网体来源&结余逻辑)
This commit is contained in:
parent
16ae61ce90
commit
1fbda5ccf2
|
|
@ -218,7 +218,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
.aBalance(BigDecimal.ZERO)
|
.aBalance(BigDecimal.ZERO)
|
||||||
.bBalance(BigDecimal.ZERO)
|
.bBalance(BigDecimal.ZERO)
|
||||||
.build();
|
.build();
|
||||||
updateMemberSettleVOList.add(updateVO);
|
|
||||||
assert baseSettleVO != null;
|
assert baseSettleVO != null;
|
||||||
log.info("processBalance baseSettleVO : {}", JSONUtil.toJsonStr(baseSettleVO));
|
log.info("processBalance baseSettleVO : {}", JSONUtil.toJsonStr(baseSettleVO));
|
||||||
if(EPlaceDept.LEFT_DEPT.getValue() == baseSettleVO.getPlaceDept()){
|
if(EPlaceDept.LEFT_DEPT.getValue() == baseSettleVO.getPlaceDept()){
|
||||||
|
|
@ -233,8 +232,9 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
updateVO.setABalance(BigDecimal.ZERO);
|
updateVO.setABalance(BigDecimal.ZERO);
|
||||||
updateVO.setBBalance(nowSettleVO.getABalance().add(pendingPV));
|
updateVO.setBBalance(nowSettleVO.getABalance().add(pendingPV));
|
||||||
}
|
}
|
||||||
// }else if(EPlaceDept.RIGHT_DEPT.getValue() == baseSettleVO.getPlaceDep()){
|
updateMemberSettleVOList.add(updateVO);
|
||||||
} else {
|
}else if(EPlaceDept.RIGHT_DEPT.getValue() == baseSettleVO.getPlaceDept()){
|
||||||
|
// } else {
|
||||||
BigDecimal bBalance = nowSettleVO.getBBalance();
|
BigDecimal bBalance = nowSettleVO.getBBalance();
|
||||||
BigDecimal result = bBalance.subtract(pendingPV);
|
BigDecimal result = bBalance.subtract(pendingPV);
|
||||||
|
|
||||||
|
|
@ -247,6 +247,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
updateVO.setBBalance(BigDecimal.ZERO);
|
updateVO.setBBalance(BigDecimal.ZERO);
|
||||||
updateVO.setABalance(nowSettleVO.getBBalance().add(pendingPV));
|
updateVO.setABalance(nowSettleVO.getBBalance().add(pendingPV));
|
||||||
}
|
}
|
||||||
|
updateMemberSettleVOList.add(updateVO);
|
||||||
}
|
}
|
||||||
baseSettleVO = nowSettleVO;
|
baseSettleVO = nowSettleVO;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue