diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java index 4bdde4b7b..ab7c34ecb 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/pay/AlipayPayService.java @@ -54,8 +54,8 @@ public class AlipayPayService { req.setOpenId(payParam.getOpenId()); // 通道通知地址: 始终使用平台生成的回调地址(支付宝→平台), 不使用 payParam.notifyUrl(语义为平台→商户) req.setNotifyUrl(this.buildNotifyUrl(order)); - // 关单时间透传, 子应用据此向支付宝设置 time_expire - req.setExpireTime(payParam.getExpiredTime()); + // 关单时间取自订单(createOrder 已对 null 兜底默认30分钟), 子应用据此向支付宝设置 time_expire + req.setExpireTime(order.getExpiredTime()); req.setCredential(credential); // 调用子应用 diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java index 3c214a4b7..792b2faa4 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java @@ -55,7 +55,8 @@ public class WechatIsvPayService { req.setOpenId(payParam.getOpenId()); req.setAttach(payParam.getAttach()); req.setNotifyUrl(this.buildNotifyUrl(order)); - req.setExpireTime(payParam.getExpiredTime()); + // 关单时间取自订单(createOrder 已对 null 兜底默认30分钟), 不用 payParam 原始入参 + req.setExpireTime(order.getExpiredTime()); if (req.getMethod() == WechatPayMethod.H5) { req.setWapUrl(payParam.getReturnUrl()); req.setWapName(payParam.getTitle()); diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java index 326c01ad3..528ca59e5 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java @@ -55,7 +55,8 @@ public class WechatPayService { req.setAttach(payParam.getAttach()); // 通道通知地址: 始终使用平台生成的回调地址(微信→平台), 不使用 payParam.notifyUrl(语义为平台→商户) req.setNotifyUrl(this.buildNotifyUrl(order)); - req.setExpireTime(payParam.getExpiredTime()); + // 关单时间取自订单(createOrder 已对 null 兜底默认30分钟), 不用 payParam 原始入参 + req.setExpireTime(order.getExpiredTime()); // H5 场景信息(场景参数) if (req.getMethod() == WechatPayMethod.H5) { req.setWapUrl(payParam.getReturnUrl());