|
|
@@ -497,7 +497,13 @@ public class PaypalService {
|
|
|
|
|
|
DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss+08:00"); //ISO8601
|
|
|
String time = null;
|
|
|
- Date parse = DateUtil.parse(order.getAutoStartTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
+ Date parse = new Date();
|
|
|
+ if(StringUtils.isNotBlank(order.getAutoStartTime())){
|
|
|
+ parse = DateUtil.parse(order.getAutoStartTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
+ if(new Date().getTime() > parse.getTime()){
|
|
|
+ parse = new Date();
|
|
|
+ }
|
|
|
+ }
|
|
|
if("DAY".equals(order.getAutoPayTime())){
|
|
|
time = dateTimeFormatter2.format(new DateTime(DateUtils.nextDay(parse)).toLocalDateTime());
|
|
|
}
|