From d4d9ba83198037db2352006a9fad0dc661550ba9 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 23 Oct 2025 11:47:15 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E9=87=8D=E5=86=99=E5=B7=A6?=
 =?UTF-8?q?=E5=8F=B3=E5=8C=BA=E7=BB=93=E4=BD=99=E9=80=BB=E8=BE=91(?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BD=91=E4=BD=93=E6=9D=A5=E6=BA=90&?=
 =?UTF-8?q?=E7=BB=93=E4=BD=99=E9=80=BB=E8=BE=91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberAchieveServiceImpl.java      |  6 ++--
 .../bonus/achieve/vo/CuMemberSettleVO.java    |  1 +
 .../member/achieve/CuMemberAchieveMapper.xml  | 28 ++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

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<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;
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 @@
     </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
-                    LEVEL,
-                    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
+                SELECT LEVEL
+                        ,
+                       period,
+                       pk_member AS pkMember,
+                       pk_parent AS pkParent,
+                       PK_PLACE_PARENT AS pkPlaceParent,
+                       place_Dept AS placeDept,
+                       member_Code AS memberCode,
+                       member_Name AS memberName
                 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