|
@@ -400,7 +400,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
OrderCancelModel model = new OrderCancelModel();
|
|
|
model.setPayChannel(paymentResp.getPaymentChannel());
|
|
|
// String status = (String) payment.get("status");
|
|
|
- if (paymentResp.getPaymentStatus() == PaymentStatus.FAILED || (DateUtil.minutesBetween(DateUtil.addHours(payingOrder.getUpdateTime(), 2),date) > 0)) {
|
|
|
+ if (paymentResp.getPaymentStatus() == PaymentStatus.FAILED) {
|
|
|
rpMap.put("remarks", paymentResp.getMsg());
|
|
|
rpMap.put("tradeState", "0");
|
|
|
model.setStatus(false);
|
|
@@ -417,8 +417,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
model.setStatus(false);
|
|
|
}*/
|
|
|
|
|
|
- if (paymentResp.getPaymentStatus() == PaymentStatus.SUCCESSED ||
|
|
|
- (paymentResp.getPaymentStatus() == PaymentStatus.FAILED || payingOrder.getCreateTime().before(DateUtil.addMinutes(new Date(), -35)))) {
|
|
|
+ if (paymentResp.getPaymentStatus() == PaymentStatus.SUCCESSED || paymentResp.getPaymentStatus() == PaymentStatus.FAILED) {
|
|
|
try {
|
|
|
updateOrder(rpMap); //更新订单
|
|
|
model.setSuccess(true);
|