From 8ebaae8e0c1316203bc3f3e00ace55327061f1a0 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Wed, 22 Oct 2025 14:16:30 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CuMemberAchieveServiceImpl.java    |  5 ++++-
 .../com/hzs/bonus/achieve/vo/CuMemberSettleVO.java  |  2 +-
 .../mapper/member/achieve/CuMemberAchieveMapper.xml | 13 ++++++++++---
 3 files changed, 15 insertions(+), 5 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 295df82d..09abe59f 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
@@ -2,6 +2,7 @@ package com.hzs.bonus.achieve.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.bonus.achieve.service.ICuMemberAchieveService;
 import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
@@ -205,6 +206,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         if(ObjectUtil.isEmpty(baseSettleVO)){
             return;
         }
+        log.info("processBalance saOrder : {}", JSONUtil.toJsonStr(saOrder));
         BigDecimal pendingPV = cuMemberAchieve.getNewPv();
         // 排除本人的上级网体修改列表
         List<CuMemberSettleVO> updateMemberSettleVOList = new ArrayList<>();
@@ -218,7 +220,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
                     .build();
             updateMemberSettleVOList.add(updateVO);
             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 result = aBalance.subtract(pendingPV);
                 if (result.compareTo(BigDecimal.ZERO) >= 0) {
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 cc5465a9..6794f994 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,7 +16,7 @@ public class CuMemberSettleVO implements Serializable {
     private Integer level;
     private Long pkMember;
     private Long pkParent;
-    private Integer placeDep;
+    private Integer placeDept;
     private String memberCode;
     private String memberName;
     private Integer period;
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 37cc19ab..c72dfaa5 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
@@ -1327,9 +1327,16 @@
             *
         FROM
             (
-                SELECT LEVEL
-                        ,
-                       cm.*
+                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
                 FROM
                     ${targetTable} cm START WITH cm.pk_member = #{pkMember} CONNECT BY cm.PK_MEMBER = PRIOR cm.PK_PARENT
                 ORDER BY