## Opt - 重写左右区结余逻辑(调整网体来源&结余逻辑)

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<CuMemberAchieveMappe
                 if (result.compareTo(BigDecimal.ZERO) >= 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<CuMemberAchieveMappe
                 if (result.compareTo(BigDecimal.ZERO) >= 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;

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;

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

@@ -1324,24 +1324,26 @@
     </select>
     <select id="getParentMemberList" resultType="com.hzs.bonus.achieve.vo.CuMemberSettleVO">
         SELECT
-            *
+            settle.A_BALANCE AS aBalance,
+            settle.B_BALANCE AS bBalance,
+            tree.*
         FROM
             (
-                SELECT
+                SELECT LEVEL
-                    LEVEL,
+                        ,
-                    cm.period,
+                       period,
-                    cm.pk_member as pkMember,
+                       pk_member AS pkMember,
-                    cm.pk_parent as pkParent,
+                       pk_parent AS pkParent,
-                    cm.place_Dept as placeDept,
+                       PK_PLACE_PARENT AS pkPlaceParent,
-                    cm.member_Code as memberCode,
+                       place_Dept AS placeDept,
-                    cm.member_Name as memberName,
+                       member_Code AS memberCode,
-                    cm.a_Balance as aBalance,
+                       member_Name AS memberName
-                    cm.b_Balance as bBalance
                 FROM
-                    ${targetTable} cm START WITH cm.pk_member = #{pkMember} CONNECT BY cm.PK_MEMBER = PRIOR cm.PK_PARENT
+                        ( SELECT * FROM ${sourceTable} WHERE period = #{period} ) START WITH pk_member = #{pkMember} CONNECT BY PK_MEMBER = PRIOR PK_PLACE_PARENT
                 ORDER BY
                     LEVEL
-            )
+            ) tree
+                LEFT JOIN ${targetTable} settle ON tree.pkMember = settle.pk_member
     </select>
     <update id="batchUpdateBalance">
         MERGE INTO ${targetTable} t