oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步 Date 转换 LocalDateTime 的修改~

Browse Source
This commit is contained in:
YunaiV
2022-11-11 00:20:57 +08:00
parent 2460e492cf
commit 19d9d66a38
336 changed files with 3536 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
归档/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/dto/PayTransactionCreateReqDTO.java
View File

@@ -8,7 +8,7 @@ import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 支付交易单创建 DTO
@@ -67,6 +67,6 @@ public class PayTransactionCreateReqDTO implements Serializable {
* 交易过期时间
*/
@NotNull(message = "交易过期时间不能为空")
private Date expireTime;
private LocalDateTime expireTime;
}

10
归档/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/dto/PayTransactionPageReqDTO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 支付交易分页 Request DTO
@@ -18,19 +18,19 @@ public class PayTransactionPageReqDTO extends PageParam {
/**
* 创建时间（开始）
*/
private Date createBeginTime;
private LocalDateTime createBeginTime;
/**
* 创建时间（结束）
*/
private Date createEndTime;
private LocalDateTime createEndTime;
/**
* 支付时间（开始）
*/
private Date paymentBeginTime;
private LocalDateTime paymentBeginTime;
/**
* 支付时间（结束）
*/
private Date paymentEndTime;
private LocalDateTime paymentEndTime;
/**
* 支付状态
*/

12
归档/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/dto/PayTransactionRespDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 支付交易 Response DTO
@@ -56,11 +56,11 @@ public class PayTransactionRespDTO implements Serializable {
/**
* 交易过期时间
*/
private Date expireTime;
private LocalDateTime expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
private LocalDateTime finishTime;
/**
* 异步通知地址
*/
@@ -76,11 +76,11 @@ public class PayTransactionRespDTO implements Serializable {
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
private LocalDateTime paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
private LocalDateTime notifyTime;
/**
* 第三方的流水号
*/
@@ -92,6 +92,6 @@ public class PayTransactionRespDTO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}

2
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/client/thirdpay/PingxxThirdPayClient.java
View File

@@ -14,7 +14,7 @@ import com.pingplusplus.exception.*;
import com.pingplusplus.model.Charge;
import com.pingplusplus.model.Refund;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;

4
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/client/thirdpay/dto/ThirdPayRefundSuccessRespDTO.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.mall.payservice.client.thirdpay.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 三方平台的交易退款成功 Response DTO
@@ -25,7 +25,7 @@ public class ThirdPayRefundSuccessRespDTO {
/**
* 第三方退款成功的时间
*/
private Date refundTime;
private LocalDateTime refundTime;
/**
* 是否成功
*/

4
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/client/thirdpay/dto/ThirdPayTransactionSuccessRespDTO.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.mall.payservice.client.thirdpay.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 三方平台的交易支付成功 Response DTO
@@ -25,6 +25,6 @@ public class ThirdPayTransactionSuccessRespDTO {
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
private LocalDateTime paymentTime;
}

6
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/notify/PayNotifyTaskDO.java
View File

@@ -12,7 +12,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 支付通知 App 的任务 DO
@@ -64,11 +64,11 @@ public class PayNotifyTaskDO extends DeletableDO {
/**
* 下一次通知时间
*/
private Date nextNotifyTime;
private LocalDateTime nextNotifyTime;
/**
* 最后一次执行时间
*/
private Date lastExecuteTime;
private LocalDateTime lastExecuteTime;
/**
* 当前通知次数
*/

8
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/refund/PayRefundDO.java
View File

@@ -7,7 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 退款单 DO
@@ -75,7 +75,7 @@ public class PayRefundDO extends DeletableDO {
/**
* 回调业务线完成时间
*/
private Date finishTime;
private LocalDateTime finishTime;
/**
* 异步通知地址
*/
@@ -93,13 +93,13 @@ public class PayRefundDO extends DeletableDO {
/**
* 第三方退款成功的时间
*/
private Date refundTime;
private LocalDateTime refundTime;
/**
* 收到第三方系统通知的时间
*
* 一般情况下，即第三方系统的异步通知
*/
private Date notifyTime;
private LocalDateTime notifyTime;
/**
* 第三方的流水号
*/

10
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/transaction/PayTransactionDO.java
View File

@@ -7,7 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 支付交易表
@@ -62,11 +62,11 @@ public class PayTransactionDO extends DeletableDO {
/**
* 交易过期时间
*/
private Date expireTime;
private LocalDateTime expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
private LocalDateTime finishTime;
/**
* 异步通知地址
*/
@@ -83,11 +83,11 @@ public class PayTransactionDO extends DeletableDO {
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
private LocalDateTime paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
private LocalDateTime notifyTime;
/**
* 第三方的流水号
*/

16
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/mapper/refund/PayRefundMapper.java
View File

@@ -38,19 +38,19 @@ public interface PayRefundMapper extends BaseMapper<PayRefundDO> {
// AND pay_channel = #{payChannel}
// </if>
// List<PayRefundDO> selectListByPage(@Param("createBeginTime") Date createBeginTime,
// @Param("createEndTime") Date createEndTime,
// @Param("finishBeginTime") Date finishBeginTime,
// @Param("finishEndTime") Date finishEndTime,
// List<PayRefundDO> selectListByPage(@Param("createBeginTime") LocalDateTime createBeginTime,
// @Param("createEndTime") LocalDateTime createEndTime,
// @Param("finishBeginTime") LocalDateTime finishBeginTime,
// @Param("finishEndTime") LocalDateTime finishEndTime,
// @Param("status") Integer status,
// @Param("payChannel") Integer payChannel,
// @Param("offset") Integer offset,
// @Param("limit") Integer limit);
//
// Integer selectCountByPage(@Param("createBeginTime") Date createBeginTime,
// @Param("createEndTime") Date createEndTime,
// @Param("finishBeginTime") Date finishBeginTime,
// @Param("finishEndTime") Date finishEndTime,
// Integer selectCountByPage(@Param("createBeginTime") LocalDateTime createBeginTime,
// @Param("createEndTime") LocalDateTime createEndTime,
// @Param("finishBeginTime") LocalDateTime finishBeginTime,
// @Param("finishEndTime") LocalDateTime finishEndTime,
// @Param("status") Integer status,
// @Param("payChannel") Integer payChannel);

2
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/mq/consumer/AbstractPayNotifySuccessMQConsumer.java
View File

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.Calendar;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.Map;
public abstract class AbstractPayNotifySuccessMQConsumer<T extends AbstractPayNotifySuccessMessage> {

2
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/mq/consumer/PayRefundSuccessMQConsumer.java
View File

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.Date;
import java.time.LocalDateTime;
@Service
@RocketMQMessageListener(

2
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/mq/consumer/PayTransactionSuccessMQConsumer.java
View File

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.Date;
import java.time.LocalDateTime;
@Service
@RocketMQMessageListener(

2
归档/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/impl/PayTransactionServiceImpl.java
View File

@@ -26,7 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.Date;
import java.time.LocalDateTime;
import static cn.iocoder.mall.payservice.enums.PayErrorCodeConstants.*;