Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java

@@ -39,6 +39,8 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
      *
      * @param tableName
      */
+    void createCuMemberRetailDetailMemberUnique(String tableName);
+
     void createCuMemberRetailDetailMemberIndex(String tableName);
 
     /*

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailRangeServiceImpl.java

@@ -46,7 +46,7 @@ public class CuMemberRetailRangeServiceImpl extends ServiceImpl<CuMemberRetailRa
     @Override
     public void mergeMemberRetailRangeDetailByYesterday(String detailTableName, String yesterdayDetailTableName) {
         // 清空当前明细表
-        iCuMemberTreeService.clearTable(detailTableName);
+        iCuMemberTreeService.truncateCuMemberTreeTable(detailTableName);
         // 用昨天的数据初始化当前明细表
         baseMapper.mergeMemberRetailRangeDetailByYesterday(detailTableName, yesterdayDetailTableName);
     }

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java

@@ -58,6 +58,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
         number = baseMapper.queryExistOracleTable(retailRangeTableDetailName);
         if (number == null || number <= 0) {
             baseMapper.createCuMemberRetailDetail(retailRangeTableDetailName);
+            baseMapper.createCuMemberRetailDetailMemberUnique(retailRangeTableDetailName);
             baseMapper.createCuMemberRetailDetailMemberIndex(retailRangeTableDetailName);
         }
 

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml

@@ -139,6 +139,58 @@
 
     <!-- 将昨天的结算明细迁移到今天 -->
     <update id="mergeMemberRetailRangeDetailByYesterday">
+        insert into ${detailTableName}
+        select t.pk_member,
+               t.child_node,
+               cm.pk_parent,
+               t.stage,
+               t.stage_status,
+               t.stage_date,
+               t.point_member_11,
+               t.point_11,
+               t.point_member_12,
+               t.point_12,
+               t.point_member_21,
+               t.point_21,
+               t.point_member_22,
+               t.point_22,
+               t.point_member_23,
+               t.point_23,
+               t.point_member_24,
+               t.point_24,
+               t.point_member_31,
+               t.point_31,
+               t.point_member_32,
+               t.point_32,
+               t.point_member_33,
+               t.point_33,
+               t.point_member_34,
+               t.point_34,
+               t.point_member_35,
+               t.point_35,
+               t.point_member_36,
+               t.point_36,
+               t.point_member_37,
+               t.point_37,
+               t.point_member_38,
+               t.point_38,
+               t.point_type,
+               t.point_gift,
+               t.creation_time,
+               t.point_member_first,
+               t.point_first,
+               t.point_member_second,
+               t.point_second,
+               t.point_member_third,
+               t.point_third,
+               t.third_bonus_1,
+               t.third_bonus_2,
+               t.third_bonus_3,
+               t.stage_sort
+        from ${yesterdayDetailTableName} t
+                 left join cu_member cm
+                           on cm.pk_id = t.pk_member
+<!--
         merge into ${detailTableName} a
             using (
                 select x.pk_member,
@@ -334,6 +386,7 @@
                     a.third_bonus_2 = b.third_bonus_2,
                     a.third_bonus_3 = b.third_bonus_3,
                     a.stage_sort = b.stage_sort
+ -->
     </update>
 
     <!-- 更新会员日结数据 -->

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml

@@ -332,11 +332,18 @@
     </update>
 
     <!-- 创建结算明细表会员索引 -->
-    <update id="createCuMemberRetailDetailMemberIndex">
+    <update id="createCuMemberRetailDetailMemberUnique">
         create unique index PK_${tableName}
         on ${tableName}
         (
-        PK_MEMBER, CHILD_NODE, STAGE
+        PK_MEMBER, CHILD_NODE, STAGE, STAGE_SORT
+        )
+    </update>
+    <update id="createCuMemberRetailDetailMemberIndex">
+        create unique index SS_${tableName}
+        on ${tableName}
+        (
+        PK_MEMBER, STAGE_STATUS, STAGE
         )
     </update>