From 0a87e44d7bc194e3a2820539cdfe483bc4cf0eed Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 30 Oct 2025 09:49:35 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=BB=93=E7=AE=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=85=BC=E5=AE=B9=E7=AD=89=E7=BA=A7=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=A5=96=E8=A1=94=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=EF=BC=88=E6=AD=A3=E5=B8=B8=E5=BA=94=E8=AF=A5=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/CuMemberRetailRangeMapper.java     |  6 ++--
 .../service/impl/BonusSettleRangeHandle.java  |  2 +-
 .../achieve/CuMemberRetailRangeMapper.xml     | 28 +++++++++++--------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
index 19d5e8b6..c297789c 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
@@ -53,12 +53,12 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
     void mergeMemberRetailGradeByMember(@Param("rangeTableName") String rangeTableName, @Param("pkMember") Long pkMember, @Param("isToday") Integer isToday);
 
     /**
-     * 根据会员查询会员上的所有网体
+     * 根据会员查询会员上的所有网体 -- 众康使用中
      */
     List<CuMemberRetailRangeExt> queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List<?> saOrderExtList);
 
     /**
-     * 根据会员ID查询会员数据
+     * 根据会员ID查询会员数据 -- 众康使用中
      */
     List<CuMemberRetailRangeExt> listCuMemberRetailRange(@Param("tableName") String tableName, @Param("pkMemberList") List<Long> pkMemberList);
 
@@ -117,7 +117,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
     void initMemberRetailSecondRange(@Param("tableName") String tableName, @Param("member") CuMemberExt memberList);
 
     /**
-     * 查询直推会员数据
+     * 查询直推会员数据 -- 众康使用中
      */
     List<CuMemberRetailRangeExt> listChildRetail(@Param("rangeTableName") String rangeTableName,
                                                  @Param("pkParentList") List<Long> pkParentList);
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
index 855397d4..d3a108fe 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
@@ -359,7 +359,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 }
             }
 
-            // 只有五折专区需要处理阶段收益
+            // 需要处理阶段收益
             Set<Long> findMemberDetailSet = orderList.stream().filter(tmpOrder ->
                     EOrderType.RETAIL_REGISTER.getValue() == tmpOrder.getOrderType()
                             || EOrderType.RETAIL_UPGRADE.getValue() == tmpOrder.getOrderType()
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
index 817d539e..ea54e8c2 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
@@ -751,17 +751,17 @@
             rep_pv_balance,
             gift_point,
             gift_pay_time,
-            bw.awards_value,
-            bw.awards_name,
-            bg.grade_value
+            nvl(bw.awards_value, 0) awards_value,
+            nvl(bw.awards_name, '无') awards_name,
+            nvl(bg.grade_value, 30) grade_value
             from (
             select * from ${tableName}
             start with pk_member = #{item}
             connect by pk_member = prior pk_parent
             ) a
-            inner join bd_awards bw
+            left join bd_awards bw
             on bw.pk_id = a.pk_awards
-            inner join bd_grade bg
+            left join bd_grade bg
             on bg.pk_id = a.pk_grade
             left join bd_vertex bv
             on bv.pk_id = a.pk_vertex
@@ -815,11 +815,14 @@
         rep_pv_balance,
         gift_point,
         gift_pay_time,
-        bw.awards_value,
-        bw.awards_name
+        nvl(bw.awards_value, 0) awards_value,
+        nvl(bw.awards_name, '无') awards_name,
+        nvl(bg.grade_value, 30) grade_value
         from ${tableName} a
-        inner join bd_awards bw
+        left join bd_awards bw
         on bw.pk_id = a.pk_awards
+        left join bd_grade bg
+        on bg.pk_id = a.pk_grade
         left join bd_vertex bv
         on bv.pk_id = a.pk_vertex
         where a.pk_member in
@@ -1005,11 +1008,14 @@
         rep_pv_balance,
         gift_point,
         gift_pay_time,
-        bw.awards_value,
-        bw.awards_name
+        nvl(bw.awards_value, 0) awards_value,
+        nvl(bw.awards_name, '无') awards_name,
+        nvl(bg.grade_value, 30) grade_value
         from ${rangeTableName} a
-        inner join bd_awards bw
+        left join bd_awards bw
         on bw.pk_id = a.pk_awards
+        left join bd_grade bg
+        on bg.pk_id = a.pk_grade
         left join bd_vertex bv
         on bv.pk_id = a.pk_vertex
         where a.pk_parent in