|
@@ -72,7 +72,7 @@ public class NewPayServiceImpl implements NewPayService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
PayDetails payDetails = payDetailsService.getByOrderNo(dto.getOrderNo());
|
|
PayDetails payDetails = payDetailsService.getByOrderNo(dto.getOrderNo());
|
|
|
- if (ObjectUtil.isNotNull(payDetails)) {
|
|
|
|
|
|
|
+ if (ObjectUtil.isNotNull(payDetails) && StrUtil.isNotBlank(payDetails.getRemark())) {
|
|
|
// 如果在支付有效期内,则直接返回支付参数,否则提示订单超时
|
|
// 如果在支付有效期内,则直接返回支付参数,否则提示订单超时
|
|
|
LocalDateTime createTime = LocalDateTime.parse(payDetails.getCreateTime(), DTF);
|
|
LocalDateTime createTime = LocalDateTime.parse(payDetails.getCreateTime(), DTF);
|
|
|
|
|
|
|
@@ -294,7 +294,7 @@ public class NewPayServiceImpl implements NewPayService {
|
|
|
.mchId(commonInfoService.findOne(434).getValue())
|
|
.mchId(commonInfoService.findOne(434).getValue())
|
|
|
.mchKey(commonInfoService.findOne(435).getValue())
|
|
.mchKey(commonInfoService.findOne(435).getValue())
|
|
|
// .h5Url(commonInfoService.findOne(19).getValue())
|
|
// .h5Url(commonInfoService.findOne(19).getValue())
|
|
|
- .h5Url("http://mprds4.natappfree.cc")
|
|
|
|
|
|
|
+ .h5Url("http://fwt4x5.natappfree.cc")
|
|
|
.build();
|
|
.build();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|