From cd2294e9502aad04eb434475c85f1831ab5a18f6 Mon Sep 17 00:00:00 2001
From: egzosn <egzosn@gmail.com>
Date: Sat, 4 Dec 2021 22:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1V3=E6=94=AF=E4=BB=98=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/common/util/DateUtils.java   | 3 ++-
 .../java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java    | 4 ++--
 .../src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
index 1691321..cddec8b 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/DateUtils.java
@@ -58,7 +58,8 @@ public final class DateUtils {
     }
 
     public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-    public static final String YYYY_MM_DD_T_HH_MM_SS = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+    public static final String YYYY_MM_DD_T_HH_MM_SS_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+    public static final String YYYY_MM_DD_T_HH_MM_SS_XX = "yyyy-MM-dd'T'HH:mm:ssXXX";
     public static final String YYYY_MM_DD = "yyyy-MM-dd";
     public static final String YYYYMMDD = "yyyyMMdd";
     public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java
index e009e7b..a1dc98a 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java
@@ -89,8 +89,8 @@ public class WxCombinePayService extends WxPayService {
         // 订单号
         parameters.put(WxConst.COMBINE_OUT_TRADE_NO, order.getOutTradeNo());
 
-        OrderParaStructure.loadDateParameters(parameters, WxConst.TIME_START, order, DateUtils.YYYY_MM_DD_T_HH_MM_SS);
-        OrderParaStructure.loadDateParameters(parameters, WxConst.TIME_EXPIRE, order, DateUtils.YYYY_MM_DD_T_HH_MM_SS);
+        OrderParaStructure.loadDateParameters(parameters, WxConst.TIME_START, order, DateUtils.YYYY_MM_DD_T_HH_MM_SS_XX);
+        OrderParaStructure.loadDateParameters(parameters, WxConst.TIME_EXPIRE, order, DateUtils.YYYY_MM_DD_T_HH_MM_SS_XX);
         initNotifyUrl(parameters, order);
         //支付场景描述
         OrderParaStructure.loadParameters(parameters, WxConst.SCENE_INFO, order);
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
index f175615..e73284d 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
@@ -245,7 +245,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
         parameters.put(WxConst.OUT_TRADE_NO, order.getOutTradeNo());
         //交易结束时间
         if (null != order.getExpirationTime()) {
-            parameters.put("time_expire", DateUtils.formatDate(order.getExpirationTime(), DateUtils.YYYYMMDDHHMMSS));
+            parameters.put("time_expire", DateUtils.formatDate(order.getExpirationTime(), DateUtils.YYYY_MM_DD_T_HH_MM_SS_XX));
         }
         OrderParaStructure.loadParameters(parameters, "attach", order.getAddition());
         wxParameterStructure.initNotifyUrl(parameters, order);