|
@@ -115,6 +115,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
String channelType = rpMap.get("channelType").equals("1") ? "WXPay" : (rpMap.get("channelType").equals("2") ? "Alipay" : "quickPay");
|
|
|
rpMap.put("channelType", channelType);
|
|
|
|
|
|
+ if (orderNoList.contains(rpMap.get("merOrderNo"))) {
|
|
|
+ orderNoList.remove(rpMap.get("merOrderNo"));
|
|
|
+ }
|
|
|
+
|
|
|
if (Arrays.asList(statusArr).contains(rpMap.get("tradeState"))) {
|
|
|
try {
|
|
|
updateOrder(rpMap); //更新订单
|
|
@@ -123,9 +127,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
- if (orderNoList.contains(rpMap.get("merOrderNo"))) {
|
|
|
- orderNoList.remove(rpMap.get("merOrderNo"));
|
|
|
- }
|
|
|
}
|
|
|
closeOrders(orderNoList); //关闭订单
|
|
|
}
|