Merge branch 'test-xq2' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -536,6 +536,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(StringUtils.isNotEmpty(phone), SysUser::getMobile, phone);
+        lqw.orderByDesc(SysUser::getCreateTime);
         List<SysUser> lst = list(lqw);
         if (lst.size() > 0) {
             sysUser = lst.get(0);

src/main/java/com/ydtech/modules/partner/controller/PartnerUserController.java

@@ -189,7 +189,7 @@ public class PartnerUserController extends BaseController {
      */
     @GetMapping("checkCommissionExpireTime")
     public void checkCommissionExpireTime() {
-         SpringUtil.getBean(TimedTaskUtils.class).updateOrderDateNoon();
+         SpringUtil.getBean(TimedTaskUtils.class).checkCommissionExpireTime();
     }
 
 

src/main/java/com/ydtech/modules/partner/dao/PartnerUserMapper.java

@@ -204,5 +204,6 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     @Select(" SELECT user_id,grade,name,mobile,dept_id,dept_name,identity_time FROM partner_user WHERE identity_status = 1 AND DATE(DATE_ADD(identity_time, INTERVAL (#{expireDays} + 1) DAY)) <=  CURDATE()  ")
     List<PartnerUser> queryExpiredRecords(Integer expireDays);
 
-
+    @Update("UPDATE partner_user SET upgrade_cycle_start_time = #{date} WHERE user_id = #{userId} AND grade = #{grade}")
+    void updateNextLevelAssessmentTime(@Param("userId") String userId, @Param("grade") Integer grade,@Param("date") Date date);
 }

src/main/java/com/ydtech/modules/partner/utils/TimedTaskUtils.java

@@ -147,10 +147,10 @@ public class TimedTaskUtils {
             if (null == upgradeStartTime){
                 continue;
             }
-            System.out.println("开始时间：" + formatter.format(upgradeStartTime));
+            log.info("开始时间：{}", formatter.format(upgradeStartTime));
             //  生成结束时间
             Date upgradeEndTime = PartnerDateUtils.generateEndTime(upgradeStartTime, khDays);
-            System.out.println("结束时间：" + formatter.format(upgradeEndTime));
+            log.info("结束时间：{}", formatter.format(upgradeEndTime));
             if (date.compareTo(upgradeEndTime) >= 0){
                 // TODO考核条件  不满足时需锁定
                 ExpiredCommissionUtils commissionUtils = SpringUtil.getBean(ExpiredCommissionUtils.class);
@@ -161,6 +161,7 @@ public class TimedTaskUtils {
                 }
                 //TODO    更新考核周期
                 partnerUserMapper.updateUpgradeCycleStartTime(partnerUser.getUserId(), PartnerDateUtils.addDaysToday(upgradeEndTime,1),partnerUser.getGrade());
+                partnerUserMapper.updateNextLevelAssessmentTime(partnerUser.getUserId(), (partnerUser.getGrade() + 1),PartnerDateUtils.addDaysToday(upgradeEndTime,1));
             }
 
         }
@@ -176,7 +177,9 @@ public class TimedTaskUtils {
         queryWrapper.eq("identity_status", 0);
         queryWrapper.in("grade", 2,3,4);
         queryWrapper.orderByDesc("create_time");
-        queryWrapper.notIn("id", idList);
+        if (CollectionUtil.isNotEmpty(idList)){
+            queryWrapper.notIn("id", idList);
+        }
         List<PartnerUser> partnerUsers = partnerUserMapper.selectList(queryWrapper);
 
         for (PartnerUser filteredUser : partnerUsers) {