Jelajahi Sumber

代理人3.0app开发

xuqiang 11 bulan lalu
induk
melakukan
3ebd4994ce

+ 3 - 4
src/main/java/com/ydtech/modules/partner/dao/PartnerUserMapper.java

@@ -146,8 +146,8 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     @Select(" SELECT p.id,p.user_id,p.grade,p.name,p.create_time FROM partner_user p LEFT JOIN sys_user u ON u.id = p .user_id ${ew.customSqlSegment}")
     List<PartnerUser> selectAllListVo(@Param("ew") QueryWrapper<PartnerUser> queryWrapper);
 
-    @Update("UPDATE partner_user SET identity_status = #{identityStatus},upgrade_time = DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00'),expired_time = #{expiredTime},upgrade_cycle_start_time = DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') WHERE user_id = #{userId} and grade = #{originalLevel} ")
-    void updateIdentityStatus(@Param("userId") String userId,@Param("originalLevel") String originalLevel,@Param("identityStatus")int identityStatus,@Param("expiredTime") Date expiredTime);
+    @Update("UPDATE partner_user SET identity_status = #{identityStatus},upgrade_time = DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00'),upgrade_cycle_start_time = DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') WHERE user_id = #{userId} and grade = #{originalLevel} ")
+    void updateIdentityStatus(@Param("userId") String userId,@Param("originalLevel") String originalLevel,@Param("identityStatus")int identityStatus);
 
     UserRuleVo queryUserRuleVo(@Param("userId") String userId, @Param("grade")Integer grade,@Param("period") CommissionValidityPeriod period);
 
@@ -204,6 +204,5 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     @Select(" SELECT user_id,grade,name,mobile,user_id,dept_id,dept_name,identity_time FROM partner_user WHERE identity_status = 1 AND DATE(DATE_ADD(identity_time, INTERVAL #{expireDays} DAY)) <=  CURDATE()  ")
     List<PartnerUser> queryExpiredRecords(Integer expireDays);
 
-    @Update(" UPDATE partner_user SET expired_time = #{expiredTime} WHERE  user_id = #{userId} and grade = #{grade}  ")
-    void updateExpiredTime(@Param("userId") String userId,@Param("grade") Integer grade,@Param("expiredTime") Date expiredTime);
+
 }

+ 1 - 3
src/main/java/com/ydtech/modules/partner/service/Impl/PartnerLiftingRecordServiceImpl.java

@@ -239,9 +239,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
             record.setApperId(recordApper.getId());
             purchaseRecordService.save( record);
             //更新用户锁定状态
-            PartnerRuleEntity ruleEntity = ruleService.selectByGrade(liftingRecord.getOriginalLevel());
-            Date expiredTime = PartnerDateUtils.addDaysToday(new Date(),ruleEntity.getKhDays());
-            partnerUserMapper.updateIdentityStatus(liftingRecord.getUserId(),liftingRecord.getOriginalLevel(),0,expiredTime);
+            partnerUserMapper.updateIdentityStatus(liftingRecord.getUserId(),liftingRecord.getOriginalLevel(),0);
 
             PartnerUser partnerUser = partnerUserMapper.selectOne(new LambdaQueryWrapper<PartnerUser>().eq(PartnerUser::getUserId, liftingRecord.getUserId()).eq(PartnerUser::getGrade, liftingRecord.getOriginalLevel()));
 

+ 0 - 1
src/main/java/com/ydtech/modules/partner/utils/TimedTaskUtils.java

@@ -210,7 +210,6 @@ public class TimedTaskUtils {
             today = true;
         }
         if (today){
-            partnerUserMapper.updateExpiredTime(partnerUser.getUserId(),partnerUser.getGrade(),PartnerDateUtils.addDaysToday(upgradeTime, khDays));
             partnerUserMapper.updateUpgradeCycleStartTime(partnerUser.getUserId(), upgradeTime,partnerUser.getGrade());
         }
     }