소스 검색

autoStartTime

lyhzzz 2 년 전
부모
커밋
01844d2e09

+ 3 - 0
src/main/java/com/fdkankan/pay/entity/Order.java

@@ -109,6 +109,9 @@ public class Order implements Serializable {
     @TableField("auto_pay_time")
     private String autoPayTime;
 
+    @TableField("auto_start_time")
+    private String autoStartTime;
+
 
     @TableField(exist = false)
     private String wxAppId;

+ 3 - 13
src/main/java/com/fdkankan/pay/util/DateUtils.java

@@ -7,30 +7,20 @@ import java.util.Date;
 
 public class DateUtils {
 
-    public static void main(String[] args) {
-        System.out.println("今天是:" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
-        System.out.println("今天是:" + DateUtil.format(nextDay(), "yyyy-MM-dd HH:mm:ss"));
-        System.out.println("今天是:" + DateUtil.format(nextMouth(), "yyyy-MM-dd HH:mm:ss"));
-        System.out.println("今天是:" + DateUtil.format(nextYear(), "yyyy-MM-dd HH:mm:ss"));
-    }
-
-    public static Date nextDay(){
+    public static Date nextDay(Date date){
         Calendar calendar = Calendar.getInstance();
-        Date date = new Date();
         calendar.setTime(date);
         calendar.add(Calendar.DATE, 1);
         return calendar.getTime();
     }
-    public static Date nextMouth(){
+    public static Date nextMouth(Date date){
         Calendar calendar = Calendar.getInstance();
-        Date date = new Date();
         calendar.setTime(date);
         calendar.add(Calendar.MONTH, 1);
         return calendar.getTime();
     }
-    public static Date nextYear(){
+    public static Date nextYear(Date date){
         Calendar calendar = Calendar.getInstance();
-        Date date = new Date();
         calendar.setTime(date);
         calendar.add(Calendar.YEAR, 1);
         return calendar.getTime();

+ 4 - 3
src/main/java/com/fdkankan/pay/util/paypal/sdk/PaypalService.java

@@ -497,14 +497,15 @@ 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");
         if("DAY".equals(order.getAutoPayTime())){
-            time = dateTimeFormatter2.format(new DateTime(DateUtils.nextDay()).toLocalDateTime());
+            time = dateTimeFormatter2.format(new DateTime(DateUtils.nextDay(parse)).toLocalDateTime());
         }
         if("MONTH".equals(order.getAutoPayTime())){
-            time = dateTimeFormatter2.format(new DateTime(DateUtils.nextMouth()).toLocalDateTime());
+            time = dateTimeFormatter2.format(new DateTime(DateUtils.nextMouth(parse)).toLocalDateTime());
         }
         if("YEAR".equals(order.getAutoPayTime())){
-             time = dateTimeFormatter2.format(new DateTime(DateUtils.nextYear()).toLocalDateTime());
+             time = dateTimeFormatter2.format(new DateTime(DateUtils.nextYear(parse)).toLocalDateTime());
         }
         order.setPlanId(autopayPlan.getPlanId());
         order.setStartTime(time);