畅学卡时长

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/DiscountCardRecordServiceImpl.java

@@ -74,7 +74,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
         Student student = studentService.getById(orderDetailVo.getUserId());
         LocalDate startTime = LocalDate.now();
         if (student.getDiscountEndTime() != null && student.getDiscountEndTime().after(new Date())) {
-            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
+            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         }
         LocalDate endTime = LocalDate.now();
 
@@ -97,6 +97,9 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
             default:
                 log.error("时间类型错误{}", discountCardRecord.getType());
         }
+        if (startTime.isAfter(LocalDate.now())) {
+            startTime = startTime.plusDays(1);
+        }
         discountCardRecord.setStartTime(DateUtil.localDateTimeToDate(startTime.atTime(LocalTime.MIN)));
         discountCardRecord.setEndTime(DateUtil.localDateTimeToDate(endTime.atTime(23,59,59)));