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

fix 支付订单超时时间不得早于当前时间

Browse Source
This commit is contained in:
DaxPay
2024-10-10 09:33:06 +08:00
parent 6cd49a4ba3
commit 3f8dc60a6f
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PayAssistService.java
View File

@@ -1,8 +1,13 @@
package org.dromara.daxpay.service.service.trade.pay;
import cn.bootx.platform.starter.redis.delay.service.DelayJobService;
import cn.bootx.platform.core.exception.ValidationFailedException;
import cn.bootx.platform.core.util.BigDecimalUtil;
import cn.bootx.platform.core.util.DateTimeUtil;
import cn.bootx.platform.starter.redis.delay.service.DelayJobService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.daxpay.core.enums.PayAllocStatusEnum;
import org.dromara.daxpay.core.enums.PayRefundStatusEnum;
import org.dromara.daxpay.core.enums.PayStatusEnum;
@@ -19,10 +24,6 @@ import org.dromara.daxpay.service.common.local.PaymentContextLocal;
import org.dromara.daxpay.service.dao.order.pay.PayOrderManager;
import org.dromara.daxpay.service.entity.order.pay.PayOrder;
import org.dromara.daxpay.service.service.order.pay.PayOrderQueryService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -176,4 +177,14 @@ public class PayAssistService {
// 根据商户应用配置计算出时间
return PayUtil.getPaymentExpiredTime(mchAppLocal.getOrderTimeout());
}
/**
* 校验订单超时时间是否正常
*/
public void validationExpiredTime(PayParam payParam) {
LocalDateTime expiredTime = this.getExpiredTime(payParam);
if (Objects.nonNull(expiredTime) && DateTimeUtil.lt(LocalDateTime.now(), expiredTime)) {
throw new ValidationFailedException("支付超时时间设置有误, 请检查!");
}
}
}

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PayService.java
View File

@@ -45,6 +45,8 @@ public class PayService {
public PayResult pay(PayParam payParam){
// 校验支付限额
payAssistService.validationLimitAmount(payParam);
// 校验超时时间, 不可早于当前
payAssistService.validationExpiredTime(payParam);
// 获取商户订单号
String bizOrderNo = payParam.getBizOrderNo();
// 加锁