Browse Source

修改订单回调逻辑,跳过审核中的的订单

hgw 3 years ago
parent
commit
0490b188a8

+ 8 - 0
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -314,6 +314,14 @@ public class StudentOrderController extends BaseController {
             if (StringUtils.isNotBlank(orderNo) && !orderNo.equals(payingOrder.getOrderNo())) {
                 continue;
             }
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(payingOrder.getMusicGroupId()) && Objects.nonNull(payingOrder.getUserId())) {
+                StudentRegistration studentRegister = studentRegistrationDao.getStudentRegister(payingOrder.getMusicGroupId(), payingOrder.getUserId());
+                if (Objects.nonNull(studentRegister) && studentRegister.getPayingStatus() == 2) {
+                    //跳过审核中的
+                    continue;
+                }
+            }
+
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("tradeState", "1");
             rpMap.put("remarks", "模拟支付成功");