|
@@ -314,6 +314,14 @@ public class StudentOrderController extends BaseController {
|
|
if (StringUtils.isNotBlank(orderNo) && !orderNo.equals(payingOrder.getOrderNo())) {
|
|
if (StringUtils.isNotBlank(orderNo) && !orderNo.equals(payingOrder.getOrderNo())) {
|
|
continue;
|
|
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<>();
|
|
Map<String, String> rpMap = new HashMap<>();
|
|
rpMap.put("tradeState", "1");
|
|
rpMap.put("tradeState", "1");
|
|
rpMap.put("remarks", "模拟支付成功");
|
|
rpMap.put("remarks", "模拟支付成功");
|