dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-03 11:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf 支付订单增加关闭时间属性

Browse Source
This commit is contained in:
bootx
2024-02-22 23:07:23 +08:00
parent 133982ef03
commit 75c2311c64
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/entity/PayOrder.java
View File

@@ -78,6 +78,10 @@ public class PayOrder extends MpBaseEntity implements EntityBaseFunction<PayOrde
@DbColumn(comment = "支付时间")
private LocalDateTime payTime;
/** 关闭时间 */
@DbColumn(comment = "支付时间")
private LocalDateTime closeTime;
/** 过期时间 */
@DbColumn(comment = "过期时间")
private LocalDateTime expiredTime;

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java
View File

@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -130,7 +131,8 @@ public class PayCloseService {
*/
private void successHandler(PayOrder payOrder){
// 取消订单
payOrder.setStatus(PayStatusEnum.CLOSE.getCode());
payOrder.setStatus(PayStatusEnum.CLOSE.getCode())
.setCloseTime(LocalDateTime.now());
payOrderService.updateById(payOrder);
this.saveRecord(payOrder,true,null);
}

12
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/result/PayNoticeResult.java
View File

@@ -2,6 +2,8 @@ package cn.bootx.platform.daxpay.service.core.payment.notice.result;
import cn.bootx.platform.daxpay.code.PayChannelEnum;
import cn.bootx.platform.daxpay.code.PayStatusEnum;
import cn.bootx.platform.daxpay.serializer.LocalDateTimeToTimestampSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -46,11 +48,17 @@ public class PayNoticeResult {
@Schema(description = "支付状态")
private String status;
@Schema(description = "支付创建时间")
@JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
private LocalDateTime createTime;
@Schema(description = "支付成功时间")
@JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
private LocalDateTime payTime;
@Schema(description = "支付创建时间")
private LocalDateTime createTime;
@Schema(description = "支付关闭时间")
@JsonSerialize(using = LocalDateTimeToTimestampSerializer.class)
private LocalDateTime closeTime;
@Schema(description = "商户扩展参数,回调时会原样返回")
private String attach;

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/notice/service/ClientNoticeService.java
View File

@@ -152,6 +152,7 @@ public class ClientNoticeService {
.setBusinessNo(order.getBusinessNo())
.setAmount(order.getAmount())
.setPayTime(order.getPayTime())
.setCloseTime(order.getCloseTime())
.setCreateTime(order.getCreateTime())
.setStatus(order.getStatus())
.setAttach(orderExtra.getAttach())

8
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java
View File

@@ -140,7 +140,9 @@ public class PayRepairService {
private void closeLocal(PayOrder order, List<AbsPayRepairStrategy> absPayStrategies) {
// 执行策略的关闭方法
absPayStrategies.forEach(AbsPayRepairStrategy::doCloseLocalHandler);
order.setStatus(PayStatusEnum.CLOSE.getCode());
order.setStatus(PayStatusEnum.CLOSE.getCode())
// TODO 尝试是否可以使用网关返回的
.setCloseTime(LocalDateTime.now());
payOrderService.updateById(order);
}
/**
@@ -150,7 +152,9 @@ public class PayRepairService {
private void closeGateway(PayOrder payOrder, List<AbsPayRepairStrategy> absPayStrategies) {
// 执行策略的关闭方法
absPayStrategies.forEach(AbsPayRepairStrategy::doCloseGatewayHandler);
payOrder.setStatus(PayStatusEnum.CLOSE.getCode());
payOrder.setStatus(PayStatusEnum.CLOSE.getCode())
// TODO 尝试是否可以使用网关返回的
.setCloseTime(LocalDateTime.now());
payOrderService.updateById(payOrder);
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java
View File

@@ -68,6 +68,10 @@ public class PayOrderDto extends BaseDto {
@Schema(description = "支付时间")
private LocalDateTime payTime;
/** 关闭时间 */
@Schema(description = "关闭时间")
private LocalDateTime closeTime;
/** 过期时间 */
@Schema(description = "过期时间")
private LocalDateTime expiredTime;