## Opt - 脱敏增加最大长度

bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java

@@ -21,4 +21,11 @@ public interface IMemberJobServiceApi {
      */
     R<?> deleteAccountDetailByMonth();
 
+    /**
+     * 清除7天前0元会员
+     *
+     * @return
+     */
+    R<?> clearZeroMember();
+
 }

bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java

@@ -296,9 +296,9 @@ public interface IMemberServiceApi {
      * 用户降级 -- 来源于活动
      *
      * @param cuMember 用户信息
-     * @param saOrder  订单信息
+     * @param pkOrder  订单ID
      */
-    R<?> reduceMemberLevel(CuMember cuMember, SaOrder saOrder);
+    R<?> reduceMemberLevel(CuMember cuMember, Long pkOrder);
 
     /**
      * 更新升级记录 -- 来源于活动
@@ -442,4 +442,5 @@ public interface IMemberServiceApi {
 
     R<Map<String, Long>> memberRegionMap(Date settleDate);
 
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberAccountMapper.java

@@ -219,4 +219,10 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
     CuMemberAccountExt queryAccountSummaryByVertex(@Param("pkVertex") Long pkVertex, @Param("pkCountry") Integer pkCountry);
 
     void deleteCuMemberAccountByMemberCode(@Param("userId") Long userId, @Param("date")Date date, @Param("memberCode")String memberCode);
+
+    /**
+     * 清除7天前0元会员
+     */
+    void clearZeroMember();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java

@@ -3,9 +3,13 @@ package com.hzs.member.account.provider;
 import com.hzs.common.core.domain.R;
 import com.hzs.member.account.IMemberJobServiceApi;
 import com.hzs.member.account.service.ICuMemberAccountDetailService;
+import com.hzs.member.account.service.ICuMemberAccountService;
+import com.hzs.member.base.service.ICuMemberRegisterService;
+import com.hzs.member.base.service.ICuMemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员模块定时任务服务提供
@@ -16,6 +20,12 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi {
 
     @Autowired
     private ICuMemberAccountDetailService iCuMemberAccountDetailService;
+    @Autowired
+    private ICuMemberService iCuMemberService;
+    @Autowired
+    private ICuMemberAccountService iCuMemberAccountService;
+    @Autowired
+    private ICuMemberRegisterService iCuMemberRegisterService;
 
     @Override
     public R<?> insertAccountDetail() {
@@ -39,4 +49,21 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi {
         return R.ok();
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public R<?> clearZeroMember() {
+        try {
+            // 删除会员注册信息
+            iCuMemberRegisterService.clearZeroMember();
+            // 删除会员账户
+            iCuMemberAccountService.clearZeroMember();
+            // 账户会员信息
+            iCuMemberService.clearZeroMember();
+        } catch (Exception e) {
+            log.info("清除7天前0元会员失败：", e);
+            return R.fail(e.getMessage());
+        }
+        return R.ok();
+    }
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java

@@ -285,4 +285,10 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
     CuMemberAccountExt queryAccountSummaryByVertex(Long pkVertex, Integer pkCountry);
 
     void deleteCuMemberAccountByMemberCode(Long userId, Date date, String memberCode);
+
+    /**
+     * 清除7天前0元会员
+     */
+    void clearZeroMember();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java

@@ -809,5 +809,10 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
         baseMapper.deleteCuMemberAccountByMemberCode(userId,date,memberCode);
     }
 
+    @Override
+    public void clearZeroMember() {
+        baseMapper.clearZeroMember();
+    }
+
 }
 

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java

@@ -800,4 +800,10 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     List<DeleteDeadLockVO> queryDeleteDeadLockList(@Param("memberCode") String memberCode);
 
     Integer queryIsDeadMember(@Param("memberCode") String memberCode);
+
+    /**
+     * 清除7天前0元会员
+     */
+    void clearZeroMember();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java

@@ -35,4 +35,9 @@ public interface CuMemberRegisterMapper extends BaseMapper<CuMemberRegister> {
      */
     int insertBatchMemberRegister(@Param("registerMemberList") List<CuMemberRegister> registerMemberList);
 
+    /**
+     * 清除7天前0元会员
+     */
+    int clearZeroMember();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java

@@ -352,9 +352,9 @@ public class MemberServiceProvider implements IMemberServiceApi {
     }
 
     @Override
-    public R<?> reduceMemberLevel(CuMember cuMember, SaOrder saOrder) {
+    public R<?> reduceMemberLevel(CuMember cuMember, Long pkOrder) {
         try {
-            iCuMemberBusinessService.reduceMemberLevel(cuMember, saOrder);
+            iCuMemberBusinessService.reduceMemberLevel(cuMember, pkOrder);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java

@@ -180,9 +180,9 @@ public interface ICuMemberBusinessService {
      * 用户降级 -- 来源于活动
      *
      * @param cuMember 用户信息
-     * @param saOrder  订单信息
+     * @param pkOrder  订单ID
      */
-    void reduceMemberLevel(CuMember cuMember, SaOrder saOrder);
+    void reduceMemberLevel(CuMember cuMember, Long pkOrder);
 
     /**
      * 更新升级记录 -- 来源于活动

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java

@@ -41,4 +41,9 @@ public interface ICuMemberRegisterService extends IService<CuMemberRegister> {
      */
     int insertBatchMemberRegister(List<CuMemberRegister> registerMemberList);
 
+    /**
+     * 清除7天前0元会员
+     */
+    void clearZeroMember();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java

@@ -1021,5 +1021,9 @@ public interface ICuMemberService extends IService<CuMember> {
      */
     CuMember shareRegisterMember(ShareRegisterParam registerParam);
 
+    /**
+     * 清除7天前0元会员
+     */
+    void clearZeroMember();
 
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java

@@ -1207,12 +1207,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void reduceMemberLevel(CuMember cuMember, SaOrder saOrder) {
+    public void reduceMemberLevel(CuMember cuMember, Long pkOrder) {
         updateCuMember(cuMember);
         iCuMemberLevelService.update(Wrappers.<CuMemberLevel>lambdaUpdate()
                 .eq(CuMemberLevel::getPkMember, cuMember.getPkId())
                 .eq(CuMemberLevel::getUpType, EUpgradeType.ACTIVITY_UPGRADE.getValue())
-                .eq(CuMemberLevel::getPkOrder, saOrder.getPkId())
+                .eq(CuMemberLevel::getPkOrder, pkOrder)
                 .set(CuMemberLevel::getDelFlag, EDelFlag.DELETE.getValue())
                 .set(CuMemberLevel::getUpgradeTime, new Date())
         );

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java

@@ -48,4 +48,8 @@ public class CuMemberRegisterServiceImpl extends ServiceImpl<CuMemberRegisterMap
         return baseMapper.insertBatchMemberRegister(registerMemberList);
     }
 
+    @Override
+    public void clearZeroMember() {
+        baseMapper.clearZeroMember();
+    }
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -3642,5 +3642,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         return cuMember;
     }
 
+    @Override
+    public void clearZeroMember() {
+        baseMapper.clearZeroMember();
+    }
 
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java

@@ -125,16 +125,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
                         oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type));
                         break;
-                    case SPECIAL_REGISTER_ORDER:
-                        // 乐学注册订单
-                        oldSo.setSpecialRegisterAmount(addOrInitializeAmount(oldSo.getSpecialRegisterAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialRegisterPv(addOrInitializeAmount(oldSo.getSpecialRegisterPv(), newSo.getOrderAchieve(), type));
-                        break;
-                    case SPECIAL_UPGRADE_ORDER:
-                        // 乐学升级订单
-                        oldSo.setSpecialUpgradeAmount(addOrInitializeAmount(oldSo.getSpecialUpgradeAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialUpgradePv(addOrInitializeAmount(oldSo.getSpecialUpgradePv(), newSo.getOrderAchieve(), type));
-                        break;
                     // 复购
                     case REPURCHASE_ORDER:
                     case CONSUME_ORDER:
@@ -143,11 +133,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
                         oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
                         break;
-                    case SPECIAL_REPURCHASE_ORDER:
-                        // 乐学复购订单
-                        oldSo.setSpecialRepurchaseAmount(addOrInitializeAmount(oldSo.getSpecialRepurchaseAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialRepurchasePv(addOrInitializeAmount(oldSo.getSpecialRepurchasePv(), newSo.getOrderAchieve(), type));
-                        break;
                     default:
                         break;
                 }

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java

@@ -260,16 +260,6 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
                         oldSo.setMainUpAmount(addOrInitializeAmount(oldSo.getMainUpAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainUpPv(addOrInitializeAmount(oldSo.getMainUpPv(), newSo.getOrderAchieve(), type));
                         break;
-                    case SPECIAL_REGISTER_ORDER:
-                        // 乐学注册订单
-                        oldSo.setSpecialRegisterAmount(addOrInitializeAmount(oldSo.getSpecialRegisterAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialRegisterPv(addOrInitializeAmount(oldSo.getSpecialRegisterPv(), newSo.getOrderAchieve(), type));
-                        break;
-                    case SPECIAL_UPGRADE_ORDER:
-                        // 乐学升级订单
-                        oldSo.setSpecialUpgradeAmount(addOrInitializeAmount(oldSo.getSpecialUpgradeAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialUpgradePv(addOrInitializeAmount(oldSo.getSpecialUpgradePv(), newSo.getOrderAchieve(), type));
-                        break;
                     // 复购
                     case REPURCHASE_ORDER:
                     case CONSUME_ORDER:
@@ -278,11 +268,6 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
                         oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
                         break;
-                    case SPECIAL_REPURCHASE_ORDER:
-                        // 乐学复购订单
-                        oldSo.setSpecialRepurchaseAmount(addOrInitializeAmount(oldSo.getSpecialRepurchaseAmount(), newSo.getOrderAmount(), type));
-                        oldSo.setSpecialRepurchasePv(addOrInitializeAmount(oldSo.getSpecialRepurchasePv(), newSo.getOrderAchieve(), type));
-                        break;
                     default:
                         break;
                 }

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java

@@ -74,7 +74,7 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService {
         for (DirectStatisticsTop30VO directStatisticsTop30VO : result) {
             if(param.getFaker()){
                 directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2));
-                directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0));
+                directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0, 6));
             }
             directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000)));
         }

bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml

@@ -69,9 +69,12 @@
         <result column="ACCOUNT_STATUS" property="accountStatus"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
     </resultMap>
+
     <update id="deleteCuMemberAccountByMemberCode">
         update cu_member_account cma
-        set cma.del_flag = 1,cma.PK_MODIFIED = #{userId},cma.MODIFIED_TIME = #{date}
+        set cma.del_flag      = 1,
+            cma.PK_MODIFIED   = #{userId},
+            cma.MODIFIED_TIME = #{date}
         where cma.pk_member in
               (select cm.pk_id
                from cu_member cm
@@ -1239,4 +1242,24 @@
               (select cm.pk_id from cu_member cm where cm.pk_vertex = #{pkVertex})
     </select>
 
+    <!-- 清除7天前0元会员 -->
+    <update id="clearZeroMember">
+        update cu_member_account cma
+        set cma.del_flag = 1
+        where cma.pk_member in
+              (select so.pk_member
+               from cu_member cm
+                        left join sa_order so
+                                  on so.pk_member = cm.pk_id
+                                      and so.del_flag = 0
+                                      and so.order_status = 1
+               where cm.del_flag = 0
+                 and cm.pk_settle_grade = 1
+                 and cm.pay_status = 0
+                 and cm.pay_time is null
+                 and sysdate - 8 > cm.creation_time
+               group by so.pk_member
+               having count(so.pk_member) = 0)
+    </update>
+
 </mapper>

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -3245,5 +3245,25 @@
             t.MEMBER_CODE != #{memberCode}
     </select>
 
+    <!-- 清除7天前0元会员 -->
+    <update id="clearZeroMember">
+        update cu_member cm
+        set cm.del_flag    = 1,
+            cm.member_code = cm.member_code || '-' ||
+                             trunc(dbms_random.value(100, 999))
+        where cm.pk_id in (select so.pk_member
+                           from cu_member cm
+                                    left join sa_order so
+                                              on so.pk_member = cm.pk_id
+                                                  and so.del_flag = 0
+                                                  and so.order_status = 1
+                           where cm.del_flag = 0
+                             and cm.pk_settle_grade = 1
+                             and cm.pay_status = 0
+                             and cm.pay_time is null
+                             and sysdate - 8 > cm.creation_time
+                           group by so.pk_member
+                           having count(so.pk_member) = 0)
+    </update>
 
 </mapper>

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml

@@ -171,4 +171,23 @@
         ) t
     </insert>
 
+    <!-- 清除7天前0元会员 -->
+    <update id="clearZeroMember">
+        update cu_member_register cmr
+        set cmr.del_flag = 1
+        where cmr.pk_member in (select so.pk_member
+                                from cu_member cm
+                                         left join sa_order so
+                                                   on so.pk_member = cm.pk_id
+                                                       and so.del_flag = 0
+                                                       and so.order_status = 1
+                                where cm.del_flag = 0
+                                  and cm.pk_settle_grade = 1
+                                  and cm.pay_status = 0
+                                  and cm.pay_time is null
+                                  and sysdate - 8 > cm.creation_time
+                                group by so.pk_member
+                                having count(so.pk_member) = 0);
+    </update>
+
 </mapper>

bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml

@@ -12,15 +12,16 @@
             numberOfAmount
         from (
             select
-                PK_REFERENCE,
-                count(PK_REFERENCE) numberOfPeople,
+                o.PK_REFERENCE,
+                count(DISTINCT o.PK_MEMBER) numberOfPeople,
                 sum(order_amount) numberOfAmount
-            from sa_order
+            from sa_order o
+            right join cu_member m on m.PK_ID = o.pk_member and m.DEL_FLAG = 0 and m.CATEGORY = 0
             where
-                del_flag = 0
+                o.del_flag = 0
                 and order_status = 1
                 AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1))
-                and pay_time between #{param.startDate} and #{param.endDate}
+                and o.pay_time between #{param.startDate} and #{param.endDate}
             group by PK_REFERENCE
         ) r
         left join cu_member cm on r.PK_REFERENCE = cm.pk_id
@@ -37,15 +38,16 @@
             numberOfAmount
         from (
                  select
-                     PK_REFERENCE,
-                     count(PK_REFERENCE) numberOfPeople,
+                     o.PK_REFERENCE,
+                     count(DISTINCT o.PK_MEMBER) numberOfPeople,
                      sum(order_amount) numberOfAmount
-                 from sa_order
+                 from sa_order o
+                          right join cu_member m on m.PK_ID = o.pk_member and m.DEL_FLAG = 0 and m.CATEGORY = 0
                  where
-                     del_flag = 0
+                     o.del_flag = 0
                    and order_status = 1
                    AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1))
-                   and pay_time between #{param.startDate} and #{param.endDate}
+                   and o.pay_time between #{param.startDate} and #{param.endDate}
                  group by PK_REFERENCE
              ) r
                  left join cu_member cm on r.PK_REFERENCE = cm.pk_id

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java

@@ -25,20 +25,20 @@ public class AcDirectPushUpgradeListParam {
     /**
      * 开始活动开始时间
      */
-    private Date startActStartDate;
+    private String startActStartDate;
 
     /**
      * 开始活动结束时间
      */
-    private Date startActEndDate;
+    private String startActEndDate;
 
     /**
      * 结束活动开始时间
      */
-    private Date endActStartDate;
+    private String endActStartDate;
 
     /**
      * 结束活动结束时间
      */
-    private Date endActEndDate;
+    private String endActEndDate;
 }

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java

@@ -703,14 +703,14 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
         Date nowDate = new Date();
         // 订单信息
         SaOrderExt saOrderExt = acRecommendUpgrade.getSaOrderExt();
-        // 订单ID
-        Long pkOrderId = saOrderExt.getPkId();
         // 推荐人
         Long pkMember = saOrderExt.getPkReference();
+        // 订单年月
+        String upgradeTime = DateUtils.parseDateToFormat(DateUtils.YYYYMM, saOrderExt.getPayTime());
 
         List<AcRecomUpgradeRecord> upgradeRecordList = iAcRecomUpgradeRecordService.list(Wrappers.<AcRecomUpgradeRecord>lambdaQuery()
                 .eq(AcRecomUpgradeRecord::getPkMember, pkMember)
-                .eq(AcRecomUpgradeRecord::getPkOrderId, pkOrderId)
+                .eq(AcRecomUpgradeRecord::getUpgradeTime, upgradeTime)
                 .orderByDesc(AcRecomUpgradeRecord::getUpgradeTime)
         );
         if (CollectionUtil.isNotEmpty(upgradeRecordList)) {
@@ -732,43 +732,60 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
                         .pkId(pkMember)
                         .pkSettleGrade(referenceMember.getPkSettleGrade())
                         .build();
-                iMemberServiceApi.reduceMemberLevel(cuMember, saOrderExt);
-            } else {
-                // 活动基础配置
-                AcBaseConfig baseConfig = iAcBaseConfigService.getById(recomUpgradeRecord.getPkId());
-                // 活动基础配置
-                AcRecomUpgradeRuleConfig upgradeRuleConfig = iAcRecomUpgradeRuleConfigService.getById(recomUpgradeRecord.getPkRuleId());
-                // 查询订单时间范围
-                // 默认活动开始时间
-                Date startTime = baseConfig.getActStartDate();
-                // 默认活动结束时间
-                Date endTime = baseConfig.getActEndDate();
-                // 当月第一天
-                Date monthFirst = DateUtils.getFirstDayOfMonth(nowDate);
-                if (monthFirst.compareTo(startTime) > 0) {
-                    startTime = monthFirst;
-                }
-                // 当月最后一天
-                Date monthLast = DateUtils.getLastDayOfMonth(nowDate);
-                if (monthLast.compareTo(endTime) < 0) {
-                    endTime = monthLast;
-                }
-                List<SaOrder> recomOrderList = iAcRecomUpgradeRecordService.listRecomOrder(pkMember, upgradeRuleConfig.getPkRecommendGrade(), upgradeRuleConfig.getRecommendNumber(), startTime, endTime);
-                // 校验推荐人是否可以升级
-                if (CollectionUtil.isEmpty(recomOrderList)
-                        || recomOrderList.size() != upgradeRuleConfig.getRecommendNumber()) {
-                    // 订单撤单后，目前订单不够升级了，需要降级
-                    CuMember cuMember = CuMember.builder()
-                            .pkId(pkMember)
-                            .pkSettleGrade(recomUpgradeRecord.getPkSettleGrade())
-                            .build();
-                    iMemberServiceApi.reduceMemberLevel(cuMember, saOrderExt);
-                    return;
-                }
-                // 足够升级，更新升级记录时间
-                SaOrder newOrder = recomOrderList.get(recomOrderList.size() - 1);
-                iMemberServiceApi.changeMemberLevel(saOrderExt, newOrder);
+                iMemberServiceApi.reduceMemberLevel(cuMember, recomUpgradeRecord.getPkOrderId());
+                return;
             }
+            // 活动基础配置
+            AcBaseConfig baseConfig = iAcBaseConfigService.getById(recomUpgradeRecord.getPkBaseId());
+            // 活动基础配置
+            AcRecomUpgradeRuleConfig upgradeRuleConfig = iAcRecomUpgradeRuleConfigService.getById(recomUpgradeRecord.getPkRuleId());
+            // 查询订单时间范围
+            // 默认活动开始时间
+            Date startTime = baseConfig.getActStartDate();
+            // 默认活动结束时间
+            Date endTime = baseConfig.getActEndDate();
+            // 当月第一天
+            Date monthFirst = DateUtils.getFirstDayOfMonth(nowDate);
+            if (monthFirst.compareTo(startTime) > 0) {
+                startTime = monthFirst;
+            }
+            // 当月最后一天
+            Date monthLast = DateUtils.getLastDayOfMonth(nowDate);
+            if (monthLast.compareTo(endTime) < 0) {
+                endTime = monthLast;
+            }
+            List<SaOrder> recomOrderList = iAcRecomUpgradeRecordService.listRecomOrder(pkMember, upgradeRuleConfig.getPkRecommendGrade(), upgradeRuleConfig.getRecommendNumber(), startTime, endTime);
+            // 校验推荐人是否可以升级
+            if (CollectionUtil.isEmpty(recomOrderList)
+                    || recomOrderList.size() != upgradeRuleConfig.getRecommendNumber()) {
+                // 订单撤单后，目前订单不够升级了，需要降级
+                CuMember cuMember = CuMember.builder()
+                        .pkId(pkMember)
+                        .pkSettleGrade(recomUpgradeRecord.getPkSettleGrade())
+                        .build();
+                iMemberServiceApi.reduceMemberLevel(cuMember, recomUpgradeRecord.getPkOrderId());
+                return;
+            }
+
+            // 足够升级，更新升级记录时间
+            SaOrder newOrder = recomOrderList.get(recomOrderList.size() - 1);
+
+            // 封装规则升级记录
+            AcRecomUpgradeRecord newUpgradeRecord = AcRecomUpgradeRecord.builder()
+                    .pkBaseId(baseConfig.getPkId())
+                    .pkRuleId(upgradeRuleConfig.getPkId())
+                    .pkMember(pkMember)
+                    .pkSettleGrade(recomUpgradeRecord.getPkSettleGrade())
+                    .pkRecommendGrade(recomUpgradeRecord.getPkRecommendGrade())
+                    .pkOrderId(newOrder.getPkId())
+                    .upgradeTime(upgradeTime)
+                    .build();
+            newUpgradeRecord.setPkCreator(referenceMember.getPkId());
+            newUpgradeRecord.setPkCountry(referenceMember.getPkSettleCountry());
+            iAcRecomUpgradeRecordService.save(newUpgradeRecord);
+
+            saOrderExt.setPkId(recomUpgradeRecord.getPkOrderId());
+            iMemberServiceApi.changeMemberLevel(saOrderExt, newOrder);
         }
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java

@@ -62,7 +62,7 @@ public class AcDirectPushUpgradeListVO {
     /**
      * 升级年月
      */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "升级年月", dateFormat = "yyyy-MM-dd")
     private String upgradeTime;
 
 }

bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml

@@ -79,23 +79,23 @@
         LEFT JOIN BD_GRADE BG ON arur.PK_SETTLE_GRADE = BG.PK_ID
         LEFT JOIN BD_GRADE BGG ON arur.PK_RECOMMEND_GRADE = BGG.PK_ID
         WHERE arur.DEL_FLAG = 0
-        <if test="actName != null">
+        <if test="actName != null and actName != ''">
             AND abc.ACT_NAME = #{actName}
         </if>
-        <if test="memberCode != null">
+        <if test="memberCode != null and memberCode != ''">
             AND cm.member_code = #{memberCode}
         </if>
-        <if test="startActStartDate != null">
-            AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE}
+        <if test="startActStartDate != null and startActStartDate != ''">
+            AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="startActEndDate != null">
-            AND abc.ACT_START_DATE &lt;= #{startActEndDate,javaType=DATE}
+        <if test="startActEndDate != null and startActEndDate != ''">
+            AND abc.ACT_START_DATE &lt;= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="endActStartDate != null">
-            AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE}
+        <if test="endActStartDate != null and endActStartDate != ''">
+            AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="endActEndDate != null">
-            AND abc.ACT_END_DATE &lt;= #{endActEndDate,javaType=DATE}
+        <if test="endActEndDate != null and endActEndDate != ''">
+            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
         </if>
     </select>
 

bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DataMaskingUtil.java

@@ -51,6 +51,13 @@ public class DataMaskingUtil {
 
         return result.toString();
     }
+    public static String mask(String input, int keepPrefix, int keepSuffix, int maxLength) {
+        String str = mask(input, keepPrefix, keepSuffix);
+        if(str.length() > maxLength) {
+            str = str.substring(0, maxLength);
+        }
+        return str;
+    }
 
     /**
      * 对字符串进行脱敏处理，可自定义脱敏字符

bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java

@@ -67,4 +67,15 @@ public class CuMemberJob {
         }
     }
 
+    /**
+     * 清除7天前0元会员
+     */
+    @XxlJob("clearZeroMember")
+    public void clearZeroMember() {
+        R<?> result = iMemberJobServiceApi.clearZeroMember();
+        if (!result.isSuccess()) {
+            log.error("清除7天前0元会员失败，{}", result.getMsg());
+        }
+    }
+
 }

bd-third/src/main/java/com/hzs/third/mqcall/listener/ActivityBackListener.java

@@ -51,9 +51,9 @@ public class ActivityBackListener {
                 if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
                         || EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
                     // 处理直推升级
-                    iActivityServiceApi.invokeRecommendUpgrade(AcRecommendUpgradeDTO.builder().
-                            saOrderExt(saOrderExt).
-                            orderOperateStatus(EOrderOperateStatus.CANCEL)
+                    iActivityServiceApi.invokeRecommendUpgrade(AcRecommendUpgradeDTO.builder()
+                            .saOrderExt(saOrderExt)
+                            .orderOperateStatus(EOrderOperateStatus.CANCEL)
                             .build());
                 }
             }

bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayAggregateCreateOrderRequest.java

@@ -69,10 +69,12 @@ public class JdPayAggregateCreateOrderRequest implements Serializable {
      * 同步通知页面url
      */
     private String pageBackUrl;
+    private String pagebackUrl;
 
     /**
      * 点击完成按钮后跳转页面
      */
+    private String callbackUrl;
     private String callBackUrl;
     /**
      * 风控信息map-- json串

bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java

@@ -242,8 +242,14 @@ public class JdPayServiceImpl implements IJdPayService {
                     // 用户标识（收银台必传）
                     .userId(userId)
                     // 同步通知URL（收银台必传，页面回调地址）
+
+                    .pagebackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
                     .pageBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
+
+                    .callbackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
                     .callBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
+
+                    // 支付回调地址.callBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
                     // 支付回调地址
                     .notifyUrl(jdPayBankProperties.getNotifyUrl())
                     // 交易类型