支付组件

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -412,11 +412,21 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             model.setStatus(true);
         } else if (paymentResp.getPaymentStatus() == PaymentStatus.PENDDING) {
             PaymentClose close = paymentService.close(payingOrder.getTransNo(), "超时未支付关闭", payingOrder.getOrderNo());
-            log.info("关闭订单返回：{}", close);
-            payingOrder.setStatus(CLOSE);
-            payingOrder.setMemo("超时未支付关闭");
-            callOrderCallBack(payingOrder);
-            return model;
+            if (close == null) {
+                log.error("订单关闭失败,orderNo:{}", payingOrder.getOrderNo());
+                return model;
+            }
+            if (close.getStatus() == PaymentStatus.SUCCESSED) {
+                log.info("关闭订单返回：{}", close);
+                payingOrder.setStatus(CLOSE);
+                payingOrder.setMemo("超时未支付关闭");
+                callOrderCallBack(payingOrder);
+                return model;
+            } else {
+                log.info("关闭订单返回：{}", close);
+                return model;
+            }
+
         }
         /*if (status.equals("succeeded")) {
             rpMap.put("tradeState", "1");