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 status = #{status}, - pay_time = #{payTime}, + pay_time = #{payTime}, update_time = SYSDATE() 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 @@ 1.2.10 1.10 4.5.13 + + true