代理人3.0app开发

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

@@ -11,17 +11,15 @@ import com.ydtech.modules.partner.dao.PartnerUserMapper;
 import com.ydtech.modules.partner.model.PartnerAttribute;
 import com.ydtech.modules.partner.model.PartnerLiftingRecord;
 import com.ydtech.modules.partner.model.PartnerUser;
-import com.ydtech.modules.partner.model.param.CommissionValidityPeriod;
 import com.ydtech.modules.partner.model.param.PartnerRuleEntity;
-import com.ydtech.modules.partner.model.vo.UserRuleVo;
 import com.ydtech.modules.partner.service.PartnerLiftingRecordService;
 import com.ydtech.modules.partner.service.PartnerRuleService;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -165,10 +163,10 @@ public class ExpiredCommissionUtils {
      * @param partnerUser
      */
     public  void generateLockRecords(PartnerUser partnerUser){
-        Long aLong = liftingRecordService.selectQueryDowngradeStatus(partnerUser.getUserId(), partnerUser.getGrade());
-        if (aLong > 0){
-            return;
-        }
+//        Long aLong = liftingRecordService.selectQueryDowngradeStatus(partnerUser.getUserId(), partnerUser.getGrade());
+//        if (aLong > 0){
+//            return;
+//        }
         PartnerUser selectOne = partnerUserMapper.selectOne(new QueryWrapper<PartnerUser>().eq("user_id", partnerUser.getUserId()).eq("grade", (partnerUser.getGrade() + 1)));
         PartnerUser user = new PartnerUser();
         BeanUtil.copyProperties(partnerUser,user);
@@ -186,7 +184,6 @@ public class ExpiredCommissionUtils {
         partnerUser.setIdentityStatus(true);
         partnerUser.setCommissionRate(null);
         partnerUser.setIdentityTime(PartnerDateUtils.addDaysToday(new Date(),0));
-        partnerUser.setExpiredTime(PartnerDateUtils.addDaysToday(new Date(),0));
         partnerUserMapper.updateById(partnerUser);
         partnerUserMapper.resetFixedRatio(partnerUser.getUserId(),user.getGrade());
         PartnerLiftingRecord liftingRecord = getLiftingRecord(partnerUser, user);
@@ -218,14 +215,17 @@ public class ExpiredCommissionUtils {
      * @param grade
      */
     public String generateDowngradeTime(String grade,String startTime) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         // TODO等级规则
         List<PartnerRuleEntity> partnerRuleEntities = partnerRuleService.queryAll();
         PartnerRuleEntity rule = getRule(grade, partnerRuleEntities);
         Integer khDays = rule.getKhDays();
         try {
-            Date newDate = PartnerDateUtils.addDays(formatter.parse(startTime), khDays);
-            return formatter.format(newDate);
+            LocalDateTime dateTime = LocalDateTime.parse(startTime, formatter);
+
+            // 加一天然后减一秒，得到目标日期时间
+            LocalDateTime resultDateTime = dateTime.plusDays(khDays).minusSeconds(1);
+            return  resultDateTime.format(formatter);
 
         }catch (Exception e){
             e.printStackTrace();