|
|
@@ -613,7 +613,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
|
|
|
.subject(subject)
|
|
|
.body(subject)
|
|
|
.price(orderReq.getPaymentCashAmount().setScale(2, RoundingMode.HALF_UP))
|
|
|
- .expirationTime(DateTime.now().plusMinutes(30).toDate())
|
|
|
+ .expirationTime(DateTime.now().plusMinutes(120).toDate())
|
|
|
.wxAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getWxAppId())
|
|
|
.userId(String.valueOf(orderReq.getUserId()))
|
|
|
.build();
|
|
|
@@ -857,7 +857,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
|
|
|
DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
|
|
|
|
|
|
// 下单未拉起三方支付，直接关闭
|
|
|
- if (StringUtils.isEmpty(paymentOrder.getTransNo())) {
|
|
|
+ if (StringUtils.isEmpty(paymentOrder.getTransNo()) && EPaymentStatus.WAIT_PAY == paymentOrder.getStatus()) {
|
|
|
|
|
|
// 直接关闭订单
|
|
|
UserPaymentOrderWrapper.UserPaymentOrder order = UserPaymentOrderWrapper.UserPaymentOrder
|
liujc