From b386dda7ba5c9407a719c96722b7c9e21bd6f1f8 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 16 Jun 2025 10:09:45 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=AD=89=E7=BA=A7=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberGradeServiceImpl.java        |  4 +-
 .../achieve/CuMemberRetailRangeMapper.xml     |  8 ++--
 .../bonus/detail/CuMemberGradeMapper.xml      | 44 ++++++++++++++++---
 .../member/detail/CuMemberLevelMapper.xml     |  6 ++-
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberGradeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberGradeServiceImpl.java
index 02e12052..e1370a2c 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberGradeServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberGradeServiceImpl.java
@@ -1,13 +1,11 @@
 package com.hzs.bonus.detail.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.bonus.base.service.ICuMemberService;
 import com.hzs.bonus.detail.mapper.CuMemberGradeMapper;
 import com.hzs.bonus.detail.service.ICuMemberGradeService;
 import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt;
 import com.hzs.common.domain.member.detail.CuMemberGrade;
 import com.hzs.common.domain.member.detail.CuMemberLevel;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,7 +20,7 @@ public class CuMemberGradeServiceImpl extends ServiceImpl<CuMemberGradeMapper, C
 
     @Override
     public List<CuMemberLevel> calculateCuMemberRetailGradeInit(Integer period, Date startDate, Date endDate, String rangeTableName) {
-        // 更新奖衔，回退奖衔
+        // 更新奖衔，回退等级
         baseMapper.deleteCuMemberGrade(period);
         baseMapper.updateCuMemberGrade(rangeTableName, period);
         return baseMapper.queryCuMemberLevel(startDate, endDate);
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 ca5a9e04..bc6a2071 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
@@ -300,14 +300,14 @@
             a.pk_settle_country,
             a.pk_share_awards,
             a.enable_status,
-            consume_box_num,
             new_box_num,
-            team_box_num,
+            consume_box_num,
             month_box_num,
-            team_new_box_num,
+            new_consume_pv,
             consume_pv,
             month_consume_pv,
-            new_consume_pv,
+            team_box_num,
+            team_new_box_num,
             team_consume_amount,
             team_consume_pv,
             team_month_amount,
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberGradeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberGradeMapper.xml
index 8ca32712..a1c91cde 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberGradeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberGradeMapper.xml
@@ -85,28 +85,57 @@
         a.pk_grade = b.pk_grade
     </update>
 
+    <!-- 删除等级 -->
     <delete id="deleteCuMemberGrade">
+        update cu_member_grade
+        set del_flag = 1,
+        modified_time = sysdate
+        where period = #{period}
+          and del_flag = 0
+          and up_type = 1
+
+        <!--
         delete
         from cu_member_grade
         where period = #{period}
           and del_flag = 0
           and up_type = 1
+          -->
     </delete>
 
+    <!-- 删除等级升级记录 -->
     <delete id="deleteCuMemberGradeByList">
-        delete from cu_member_grade where period = #{period} and del_flag=0 and up_type=1
+        update cu_member_grade
+        set del_flag = 1,
+        modified_time = sysdate
+        where period = #{period}
+        and del_flag = 0
+        and up_type = 1
         and pk_id in
         <foreach collection="cuMemberGradeList" item="item" open="(" close=")" separator=",">
             #{item.pkId}
         </foreach>
+
+        <!--
+        delete from cu_member_grade
+        where period = #{period} and del_flag=0 and up_type=1
+        and pk_id in
+        <foreach collection="cuMemberGradeList" item="item" open="(" close=")" separator=",">
+            #{item.pkId}
+        </foreach>
+        -->
     </delete>
 
     <select id="queryCuMemberGrade" resultMap="CuMemberGrade">
         select cg.* from cu_member_grade cg
         inner join bd_grade bg
         on cg.new_level=bg.pk_id
-        where bg.del_flag=0 and cg.del_flag=0 and bg.grade_value>=60
-        and cg.up_type=1 and cg.period=#{period} and cg.pk_member in
+        where bg.del_flag = 0
+        and cg.del_flag = 0
+        and bg.grade_value >= 60
+        and cg.up_type = 1
+        and cg.period = #{period}
+        and cg.pk_member in
         <foreach collection="cuMemberRetailRangeExtList" item="item" open="(" close=")" separator=",">
             #{item.pkMember}
         </foreach>
@@ -125,10 +154,13 @@
     <select id="queryCuMemberGradeByList" resultType="com.hzs.common.domain.member.detail.CuMemberGrade">
         select a.* from cu_member_grade a
         inner join(
-        select pk_member,max(nvl(modified_time,creation_time)) creation_time from cu_member_grade
-        where period &lt;= #{period} and del_flag=0 and up_type=2
+        select pk_member, max(nvl(modified_time,creation_time)) creation_time
+        from cu_member_grade
+        where period &lt;= #{period}
+        and del_flag = 0
+        and up_type = 2
         group by pk_member) b
-        on a.pk_member=b.pk_member and nvl(a.modified_time,a.creation_time)=b.creation_time
+        on a.pk_member = b.pk_member and nvl(a.modified_time,a.creation_time) = b.creation_time
         and a.pk_member in
         <foreach collection="memberRetailRangeExtList" item="item" open="(" close=")" separator=",">
             #{item.pkMember}
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml
index 4771c65e..8cf2aa8d 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml
@@ -23,14 +23,16 @@
     <!-- 查询最新升级记录 -->
     <select id="getLastUpgrade" resultMap="CuMemberLevel">
         select *
-        from (select *
+        from (
+        select *
         from CU_MEMBER_LEVEL cml
         where cml.del_flag = 0
         <if test="pkOrder != null">
             and (cml.pk_order != #{pkOrder} or cml.pk_order is null )
         </if>
         and cml.pk_member = #{pkMember}
-        order by cml.upgrade_time desc) t
+        order by cml.upgrade_time desc
+        ) t
         where rownum = 1
     </select>