1

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -696,20 +696,16 @@ public class YqPayController extends BaseController {
             return failed("续费用户不存在");
         }
         int promotionCount = orderService.getPromotionCount(mecUser.getBranchId());
-        if(mecUser.getBranchId()==1012){
-        	if(promotionCount >=99){
-        		return failed("对不起，本次名额已满，请您下次再来！");
-        	}
-        }else if(mecUser.getBranchId()==1020){
+        if(mecUser.getBranchId()==1020||mecUser.getBranchId()==1012){//上海和广州
         	if(promotionCount >=176){
         		return failed("对不起，本次名额已满，请您下次再来！");
         	}
-        }else if(mecUser.getBranchId()==1025){
+        }else if(mecUser.getBranchId()==1025){//杭州
         	if(promotionCount >= 154){
         		return failed("对不起，本次名额已满，请您下次再来！");
         	}
         }else{
-        	if(promotionCount >=77){
+        	if(promotionCount >=77){//其他分部
         		return failed("对不起，本次名额已满，请您下次再来！");
         	}
         }
@@ -737,7 +733,8 @@ public class YqPayController extends BaseController {
 
         if (price.compareTo(new BigDecimal("220")) >= 0) {
         	if(mecUser.getBranchId()==1012){
-        		courseAmount = price.multiply(courseTimes).subtract(new BigDecimal("500")).add(new BigDecimal("11.11"));
+//        		courseAmount = price.multiply(courseTimes).subtract(new BigDecimal("500")).add(new BigDecimal("11.11"));
+        		courseAmount = price.multiply(courseTimes).subtract(new BigDecimal("400"));
         	}else{
         		courseAmount = price.multiply(courseTimes).subtract(new BigDecimal("1111")).add(new BigDecimal("111"));
         	}