From 999d64d007eef535a0d5cc3d6f90173efd6d1ce8 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 14 Aug 2025 11:02:00 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E9=85=8D=E9=80=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E4=B8=BA=E4=BC=9E=E4=B8=8B=E6=97=B6,=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E7=BB=93=E5=B9=B6=E7=BC=93=E5=AD=98->?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E5=8D=95=E7=8B=AC=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/CuMemberRetailRangeMapper.java     |  1 +
 .../service/impl/BonusSettleRangeHandle.java  |  3 +-
 .../achieve/CuMemberRetailRangeMapper.xml     | 52 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 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 2f189373..7493002f 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
@@ -28,6 +28,7 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
      * 根据会员查询会员上的所有网体
      */
     List<CuMemberRetailRangeExt> queryCuMemberRetailRangeParent(@Param("tableName") String tableName, @Param("saOrderExtList") List<?> saOrderExtList);
+    CuMemberRetailRangeExt queryCuMemberRetailRangeByMemberId(@Param("tableName") String tableName, @Param("memberId") Long memberId);
 
     /**
      * 批量更新网体
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 2bd8c9fc..195e4362 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
@@ -802,8 +802,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         if (null != retailRegion) {
             CuMemberRetailRangeExt targetMemberRangeExt = memberRangeExtMap.get(retailRegion.getPkMember());
             if(ObjectUtil.isEmpty(targetMemberRangeExt)){
-                List<CuMemberRetailRangeExt> memberRetailRangeExtList = cuMemberRetailRangeMapper.queryCuMemberRetailRangeParent(rangeTableName, Arrays.asList(retailRegion.getPkMember()));
-                targetMemberRangeExt = memberRetailRangeExtList.stream().filter(e -> e.getPkMember().equals(retailRegion.getPkMember())).findFirst().get();
+                targetMemberRangeExt = cuMemberRetailRangeMapper.queryCuMemberRetailRangeByMemberId(rangeTableName, retailRegion.getPkMember());
                 memberRangeExtMap.put(retailRegion.getPkMember(), targetMemberRangeExt);
             }
             // 复购配送区域收益
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 8ed532c5..53a0df16 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
@@ -203,5 +203,57 @@
             where ba.del_flag = 0
         </foreach>
     </select>
+    <select id="queryCuMemberRetailRangeByMemberId"
+            resultType="com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt">
+        SELECT
+            a.pk_member,
+            a.member_code,
+            a.member_name,
+            a.pk_parent,
+            a.pk_settle_country,
+            a.category,
+            a.account_status,
+            a.pk_grade,
+            a.income_status,
+            a.pay_time,
+            a.pk_rate,
+            a.system_type,
+            a.income_status,
+            a.pk_country,
+            a.pk_settle_country,
+            a.enable_status,
+            new_box_num,
+            consume_box_num,
+            month_box_num,
+            new_consume_pv,
+            consume_pv,
+            month_consume_pv,
+            team_new_box_num,
+            team_box_num,
+            team_month_box_num,
+            team_new_pv,
+            team_consume_pv,
+            team_month_pv,
+            team_new_amount,
+            team_consume_amount,
+            team_month_amount,
+            recommend_num,
+            team_num,
+            ba.grade_value,
+            ba.grade_name,
+            a.big_box_num,
+            a.small_box_num,
+            a.big_team_pv,
+            a.small_team_pv,
+            br.name country_name
+        FROM
+            ${tableName} a
+                INNER JOIN bd_grade ba ON a.pk_grade = ba.pk_id
+                LEFT JOIN bd_area br ON br.pk_id = a.region_address
+                AND br.del_flag = 0
+        WHERE
+            ba.del_flag = 0
+          and a.pk_member = #{memberId}
+    </select>
 
 </mapper>