|
@@ -180,7 +180,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
rpMap.put("tradeState", "0");
|
|
|
}
|
|
|
|
|
|
- if (rpMap.containsKey("tradeState")) {
|
|
|
+ if (status.equals("succeeded")) {
|
|
|
try {
|
|
|
updateOrder(rpMap); //更新订单
|
|
|
} catch (Exception e) {
|
|
@@ -203,7 +203,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
//关闭或失败的订单查询订单成功,订单改成成功,钱退到余额
|
|
|
if (order != null && (order.getStatus().equals(DealStatusEnum.CLOSE) || order.getStatus().equals(DealStatusEnum.FAILED)) && status.equals(DealStatusEnum.SUCCESS)) {
|
|
|
String memo = order.getStatus().equals(DealStatusEnum.CLOSE) ? "关闭订单" : "失败订单";
|
|
|
- memo = memo+",实际支付成功,退到用户余额";
|
|
|
+ memo = memo + ",实际支付成功,退到用户余额";
|
|
|
//更新订单状态
|
|
|
order.setStatus(status);
|
|
|
order.setTransNo(rpMap.get("orderNo"));
|
|
@@ -216,7 +216,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
//增加用户余额
|
|
|
sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount(),
|
|
|
- PlatformCashAccountDetailTypeEnum.REFUNDS, memo+",订单号:"+order.getOrderNo());
|
|
|
+ PlatformCashAccountDetailTypeEnum.REFUNDS, memo + ",订单号:" + order.getOrderNo());
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -262,7 +262,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
}
|
|
|
|
|
|
Calendar beforeTime = Calendar.getInstance();
|
|
|
- beforeTime.add(Calendar.MINUTE, -30);// 30分钟之前的时间
|
|
|
+ beforeTime.add(Calendar.MINUTE, -35);// 30分钟之前的时间
|
|
|
Date beforeDate = beforeTime.getTime();
|
|
|
|
|
|
List<StudentPaymentOrder> ordersOverTime = findOrdersOverTime(orderNoList, DealStatusEnum.ING, beforeDate);
|