Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SporadicPayDto.java

@@ -14,9 +14,19 @@ public class SporadicPayDto {
     @ApiModelProperty(value = "支付项编号",required = false)
     private Integer sporadicId;
 
+    private boolean isRepeatPay;
+
     @ApiModelProperty(value = "是否余额支付",required = false)
     Boolean isUseBalancePayment = false;
 
+    public boolean getIsRepeatPay() {
+        return isRepeatPay;
+    }
+
+    public void setIsRepeatPay(boolean repeatPay) {
+        isRepeatPay = repeatPay;
+    }
+
     public BigDecimal getAmount() {
         return amount;
     }

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

@@ -184,10 +184,10 @@ public class MusicGroupController extends BaseController {
 		if (isUseBalancePayment == null) {
 			isUseBalancePayment = false;
 		}
-		// 判断是否存在支付中的记录
-		List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.MUSIC, musicGroupId, userId, DealStatusEnum.ING,
-				OrderTypeEnum.RENEW);
 		if (isRepeatPay == false) {
+            // 判断是否存在支付中的记录
+            List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.MUSIC, musicGroupId, userId, DealStatusEnum.ING,
+                    OrderTypeEnum.RENEW);
 			if (list.size() > 0) {
 				return failed(HttpStatus.CONTINUE, "您有待支付的订单");
 			}

mec-student/src/main/java/com/ym/mec/student/controller/SporadicChargeInfoController.java

@@ -6,8 +6,11 @@ import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.dto.SporadicPayDto;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
@@ -19,6 +22,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 import java.util.Map;
 
 @RequestMapping("sporadicChargeInfo")
@@ -76,9 +81,11 @@ public class SporadicChargeInfoController extends BaseController {
 			}
 			sporadicPayDto.setUserId(sysUser.getId());
 		}
-		Integer ingOrder = studentPaymentOrderService.findOrderByGroupType(sporadicPayDto.getUserId(),sporadicPayDto.getSporadicId(),"SPORADIC", DealStatusEnum.ING);
-		if (ingOrder != null && ingOrder > 0){
-			return failed("您有支付中的订单");
+		if (sporadicPayDto.getIsRepeatPay() == false) {
+			Integer ingOrder = studentPaymentOrderService.findOrderByGroupType(sporadicPayDto.getUserId(),sporadicPayDto.getSporadicId(),"SPORADIC", DealStatusEnum.ING);
+			if (ingOrder != null && ingOrder > 0) {
+				return failed(HttpStatus.CONTINUE, "您有待支付的订单");
+			}
 		}
 		Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
 		if(payMap.containsKey("tradeState")){