diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java index 09abe59f..1d8c167a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -227,10 +227,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl= 0) { // 如果结果大于等于0,直接设置aBalance updateVO.setABalance(result); + updateVO.setBBalance(nowSettleVO.getBBalance()); } else { // 如果结果小于0,aBalance设为0,bBalance设为差额绝对值 updateVO.setABalance(BigDecimal.ZERO); - updateVO.setBBalance(result.abs()); + updateVO.setBBalance(nowSettleVO.getABalance().add(pendingPV)); } // }else if(EPlaceDept.RIGHT_DEPT.getValue() == baseSettleVO.getPlaceDep()){ } else { @@ -240,10 +241,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl= 0) { // 如果结果大于等于0,直接设置bBalance updateVO.setBBalance(result); + updateVO.setABalance(nowSettleVO.getABalance()); } else { // 如果结果小于0,bBalance设为0,aBalance设为差额绝对值 updateVO.setBBalance(BigDecimal.ZERO); - updateVO.setABalance(result.abs()); + updateVO.setABalance(nowSettleVO.getBBalance().add(pendingPV)); } } baseSettleVO = nowSettleVO; diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java index 6794f994..c0bcc113 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java @@ -16,6 +16,7 @@ public class CuMemberSettleVO implements Serializable { private Integer level; private Long pkMember; private Long pkParent; + private Long pkPlaceParent; private Integer placeDept; private String memberCode; private String memberName; diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index b9bd3dab..2a20a8f5 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -1324,24 +1324,26 @@ MERGE INTO ${targetTable} t