From 67621c8250839ef7522aa3fc39dbf913cc0a95a9 Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Thu, 21 Jul 2022 15:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E4=B8=AD=20=E6=94=AF=E4=BB=98=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=8D=95=E3=80=81=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ghy/common/adapay/model/PaymentDTO.java | 4 +++-
 .../java/com/ghy/payment/service/impl/PayCallbackService.java | 3 ++-
 .../src/main/resources/mapper/payment/PaymentMapper.xml       | 2 +-
 pom.xml                                                       | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/model/PaymentDTO.java b/ghy-common/src/main/java/com/ghy/common/adapay/model/PaymentDTO.java
index 7ea5882a..78942673 100644
--- a/ghy-common/src/main/java/com/ghy/common/adapay/model/PaymentDTO.java
+++ b/ghy-common/src/main/java/com/ghy/common/adapay/model/PaymentDTO.java
@@ -5,6 +5,8 @@ import com.huifu.adapay.model.Payment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class PaymentDTO extends Payment {
@@ -29,5 +31,5 @@ public class PaymentDTO extends Payment {
     /**
      * 支付时间
      */
-    private Long payTime;
+    private LocalDateTime payTime;
 }
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
index a70735f6..8096e201 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 
 /**
  * 支付回调
@@ -41,7 +42,7 @@ public class PayCallbackService implements CallBackService {
             param.setId(payment.getId());
             param.setFeeAmt(payment.getFeeAmt());
             param.setStatus(payment.getStatus());
-            param.setPayTime(System.currentTimeMillis());
+            param.setPayTime(LocalDateTime.now());
             financialMasterService.updatePayment(param);
 
             if (AdapayStatusEnum.succeeded.code.equals(payment.getStatus())) {
diff --git a/ghy-payment/src/main/resources/mapper/payment/PaymentMapper.xml b/ghy-payment/src/main/resources/mapper/payment/PaymentMapper.xml
index f445affc..2a2b8499 100644
--- a/ghy-payment/src/main/resources/mapper/payment/PaymentMapper.xml
+++ b/ghy-payment/src/main/resources/mapper/payment/PaymentMapper.xml
@@ -52,7 +52,7 @@
         UPDATE adapay_pay_log
         <set>
             <if test="status != null and status != ''">status = #{status},</if>
-            <if test="payTime != null and payTime != ''">pay_time = #{payTime},</if>
+            <if test="payTime != null">pay_time = #{payTime},</if>
             update_time = SYSDATE()
         </set>
         WHERE id = #{id}
diff --git a/pom.xml b/pom.xml
index 3ba85311..929f5f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,8 @@
         <Adapay.version>1.2.10</Adapay.version>
         <commons.codec.version>1.10</commons.codec.version>
         <httpcomponents.version>4.5.13</httpcomponents.version>
+        <!-- 打包时跳过单元测试 -->
+        <skipTests>true</skipTests>
     </properties>
 
     <!-- 依赖声明 -->