修复重拉计划招生人数

src/main/java/com/ym/mec/collectfee/service/impl/AccountServiceImpl.java

@@ -48,8 +48,9 @@ public class AccountServiceImpl extends BaseServiceImpl<Integer, Account> implem
     @Override
     public Account getRoutingAccount(int branchId, BigDecimal money) {
         int payOrderNums = orderService.getPayOrderNums(); //获取支付中和成功的订单数
-        //分佣账户（1、每10笔，前四笔收入私户 2、私户每个商户最多收款400万）
-        if ((payOrderNums + 1) % 10 <= 4) { //私人账户
+        //分佣账户（1、每10笔，前四笔收入私户 2、私户每个商户最多收款400万），进武汉商户
+        int rem = (payOrderNums + 1) % 10;
+        if (rem > 0 && rem <= 4) { //私人账户
             branchId = 0;
         }
         return this.getAccountByBranchId(branchId, money);

src/main/java/com/ym/mec/collectfee/service/impl/CourseGroupInfoServiceImpl.java

@@ -46,8 +46,25 @@ public class CourseGroupInfoServiceImpl extends BaseServiceImpl<Integer, CourseG
                 mecCourseGroupInfo.setClassId(course.getClassId());
                 courseGroupInfoDao.insert(mecCourseGroupInfo);
             }
-            if (course != null && courseGroupInfo != null && courseGroupInfo.getPlanNum() != course.getEnrollCount()) {
+			boolean flag = false;
+            if (course != null && courseGroupInfo != null && !courseGroupInfo.getPlanNum().equals(course.getEnrollCount())) {
 				courseGroupInfo.setPlanNum(course.getEnrollCount());
+				flag = true;
+            }
+
+            if (course != null && courseGroupInfo != null && !courseGroupInfo.getFeeType().equals(course.getChargeType())) {
+                courseGroupInfo.setFeeType(course.getChargeType());
+            }
+
+            if (course != null && courseGroupInfo != null && !courseGroupInfo.getFeeType().equals(course.getChargeType())) {
+                courseGroupInfo.setFeeType(course.getChargeType());
+            }
+
+            if (course != null && courseGroupInfo != null && !courseGroupInfo.getFeeAmount().equals(course.getPrice())) {
+                courseGroupInfo.setFeeAmount(course.getPrice());
+            }
+
+            if(flag){
                 courseGroupInfoDao.upByIdAndVersion(courseGroupInfo);
             }
         }

src/main/resources/config/mybatis/CourseGroupInfoMapper.xml

@@ -113,6 +113,12 @@
             <if test="planNum != null">
                 plan_num_ = #{planNum},
             </if>
+            <if test="planNum != null">
+                plan_num_ = #{planNum},
+            </if>
+            <if test="planNum != null">
+                plan_num_ = #{planNum},
+            </if>
             <if test="version != null">
                 `version` = `version`+1
             </if>