代理人3.0app开发

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

@@ -50,8 +50,10 @@ public interface PartnerPremiumDetailsMapper extends BaseMapper<PartnerPremiumDe
     @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE app_status = 1 AND user_id = #{userId} AND source = #{grade} AND DATE(create_time) >= DATE(#{createTime}) ")
     BigDecimal commissionAfterUserLocking(@Param("userId") String userId,@Param("grade") Integer grade,@Param("createTime") Date createTime);
 
-    @Select("UPDATE partner_premium_details SET app_status = #{status} WHERE source = #{originalLevel} AND user_id = #{userId} AND DATE(create_time) >= #{identityTime} ")
-    void updateAppStatus(@Param("originalLevel") String originalLevel,@Param("userId") String userId, @Param("status")int status, @Param("identityTime")Date identityTime);
+    @Select("UPDATE partner_premium_details SET app_status = 0 WHERE app_status = 1 AND source = #{originalLevel} AND user_id = #{userId} AND DATE(create_time) >= #{identityTime} ")
+    void updateAppStatus(@Param("originalLevel") String originalLevel,@Param("userId") String userId, @Param("identityTime")Date identityTime);
 
+    @Select(" SELECT create_time FROM partner_premium_details WHERE app_status = 1 AND user_id = #{userId} AND source = #{grade} ORDER BY create_time  LIMIT 1 ")
+    Date queryRemainingDaysExpiration(@Param("userId") String userId, @Param("grade") Integer grade);
 
 }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerLiftingRecordServiceImpl.java

@@ -171,7 +171,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
     public void updateAppStatus(PartnerLiftingRecord liftingRecord){
         PartnerUser partnerUser = partnerUserMapper.selectOne(new LambdaQueryWrapper<PartnerUser>().eq(PartnerUser::getUserId, liftingRecord.getUserId())
                 .eq(PartnerUser::getGrade, liftingRecord.getAfterChange()));
-        premiumDetailsMapper.updateAppStatus(String.valueOf(partnerUser.getGrade()), liftingRecord.getUserId(), 0,partnerUser.getIdentityTime());
+        premiumDetailsMapper.updateAppStatus(String.valueOf(partnerUser.getGrade()), liftingRecord.getUserId(),partnerUser.getIdentityTime());
     }
 
 
@@ -244,7 +244,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
             PartnerUser partnerUser = partnerUserMapper.selectOne(new LambdaQueryWrapper<PartnerUser>().eq(PartnerUser::getUserId, liftingRecord.getUserId()).eq(PartnerUser::getGrade, liftingRecord.getOriginalLevel()));
 
             //更新单据状态
-            premiumDetailsMapper.updateAppStatus(liftingRecord.getOriginalLevel(), record.getUserId(),0,partnerUser.getIdentityTime());
+            premiumDetailsMapper.updateAppStatus(liftingRecord.getOriginalLevel(), record.getUserId(),partnerUser.getIdentityTime());
         }
         return HttpResult.ok("解锁成功");
     }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -905,13 +905,13 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
 
     public Long calculateTimeDifference(String userId,Integer grade){
-        Date date = liftingRecordService.selectQueryDowngradeTime(userId, grade);
+        Date date = detailsMapper.queryRemainingDaysExpiration(userId, grade);
         if (null == date){
             return null;
         }
         LocalDate localDate = date.toInstant()
                 .atZone(ZoneId.systemDefault())
-                .toLocalDate().plusDays(expireDays);
+                .toLocalDate().plusDays(expireDays + 1);
         return PartnerDateUtils.dateDifference(localDate);
     }