소스 검색

fix applyOrder bug

周箭河 5 년 전
부모
커밋
36295d1468
1개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 2
      mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

+ 5 - 2
mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -201,8 +201,10 @@ public class MusicGroupController extends BaseController {
 
         Integer userId = studentRegistration.getUserId();
 
+
         StudentPaymentOrder ApplyOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.SUCCESS);
-        if (ApplyOrder != null) {
+        StudentPaymentOrder waitPay = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
+        if (ApplyOrder != null && waitPay == null) {
             return failed("您已支付成功,请勿重复支付");
         }
 
@@ -231,7 +233,8 @@ public class MusicGroupController extends BaseController {
         Integer userId = studentRegistration.getUserId();
 
         StudentPaymentOrder ApplyOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId().toString(), DealStatusEnum.SUCCESS);
-        if (ApplyOrder != null) {
+        StudentPaymentOrder waitPay = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, studentRegistration.getMusicGroupId(), DealStatusEnum.WAIT_PAY);
+        if (ApplyOrder != null && waitPay == null) {
             return failed("您已支付成功,请勿重复支付");
         }
         Map payMap = musicGroupService.rePay(registerPayDto);