From f1264dd9946537e14bfdcd9f23045ac4f06c0a8e Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 20 Jun 2025 17:06:06 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=88=86=E7=BA=A2=E5=A5=96=E8=A1=94?=
 =?UTF-8?q?=E7=A7=92=E7=BB=93=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java | 5 +++--
 .../mapper/bonus/achieve/CuMemberRetailRangeMapper.xml       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 ea165d80..fe457a86 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
@@ -962,7 +962,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 BdAwards bdAwards = retailAwardsMap.get(awardsValue);
                 // 先验证累计业绩
                 if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) {
-                    // 验证小区，计算小区业绩（拉取直推会员数据）
+                    // 再验证小区，计算小区业绩（拉取直推会员数据）
                     List<CuMemberRetailRangeExt> cuMemberRangeExtList;
                     if (secondRangeTableName != null) {
                         // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
@@ -992,9 +992,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                         if (bdAwards.getPlaceDeptNum() > 0) {
                             // 验证是否有多个区满足业绩
                             List<CuMemberRetailRangeExt> cuMemberRetailRangeExtList;
+                            // 非秒结需要查询日结相关数据，秒结表使用上面查出的数据就可以
                             if (secondRangeTableName != null) {
                                 // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
-                                cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember());
+                                cuMemberRetailRangeExtList = cuMemberRangeExtList;
                             } else {
                                 // 昨日结算表，查询订单会员直推数据
                                 cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck());
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 a978f013..b85d2229 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
@@ -689,7 +689,7 @@
     </select>
 
     <select id="queryCuMemberSecondRangeExtByParent" resultMap="CuMemberRetailRangeExt">
-        select cm.pk_id pkMember,
+        select cm.pk_id pk_member,
         cm.pk_parent,
         nvl(b.month_consume_pv, 0) + nvl(a.new_consume_pv, 0) month_consume_pv,
         nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv,