Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -214,7 +214,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         //基础技能班和线上基础技能班，可分班原则为声部人数/6向上取整
         if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) || classGroup.getType().equals(ClassGroupTypeEnum.HIGH)) {
-            HighClassGroupNumDto highClassGroupNumDto = getSubjectMaxHighClassGroupNum(classGroup.getMusicGroupId(), classGroup.getType(), classGroup.getSubjectIdList());
+            String subjectIds = classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) ? classGroup.getMemo() : classGroup.getSubjectIdList();
+            HighClassGroupNumDto highClassGroupNumDto = getSubjectMaxHighClassGroupNum(classGroup.getMusicGroupId(), classGroup.getType(), subjectIds);
             if (highClassGroupNumDto.getNowHighClassGroupNum() >= highClassGroupNumDto.getMaxHighClassGroupNum()) {
                 String errMsg = classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) ? "线上基础技能班" : "基础技能班";
                 throw new BizException("此乐团所选声部，" + errMsg + "数量不能大于" + highClassGroupNumDto.getMaxHighClassGroupNum());
@@ -3525,7 +3526,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //基础技能班和线上基础技能班，可分班原则为声部人数/6向上取整
         String[] subjectIdArr = subjectIds.split(",");
         List<String> subjectIdList = Arrays.asList(subjectIdArr);
-        if(subjectIdList.contains("14") || subjectIdList.contains("15")){
+        if (subjectIdList.contains("14") || subjectIdList.contains("15")) {
             subjectIds += ",14,15";
         }
         HighClassGroupNumDto highClassGroupNumDto = new HighClassGroupNumDto();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -144,6 +144,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                         courseScheduleTeacherSalary.setExpectSalary(offlineTeacherSalary);
                     }
                 }
+                courseScheduleTeacherSalary.setActualSalary(null);
                 if (Objects.isNull(courseScheduleTeacherSalary.getId())) {
                     courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
                 } else {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -262,7 +262,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 
                     BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
                     for (SellOrder sellOrder : sellOrderList) {
-                        if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId().toString()) && !goodsMap.getKey().equals(sellOrder.getGoodsId().toString())) {
+                        if (Integer.valueOf(goodsMap.getKey()).equals(sellOrder.getParentGoodsId()) && !Integer.valueOf(goodsMap.getKey()).equals(sellOrder.getGoodsId())) {
                             continue;
                         }
                         BigDecimal sellOrderActualAmount = BigDecimal.ZERO;

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -96,7 +96,10 @@
                 fee_flag_ = #{feeFlag},
             </if>
                 user_id_ = #{userId},
-            <if test="schoolId != null">
+            <if test="schoolId != null and schoolId==999999999">
+                school_id_ = null,
+            </if>
+            <if test="schoolId != null and schoolId!=999999999">
                 school_id_ = #{schoolId},
             </if>
             <if test="transNo != null">
@@ -338,7 +341,7 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0)
         		</if>
         		<if test="type == 'SELL'">
         			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)
@@ -367,7 +370,7 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0)
         		</if>
         		<if test="type == 'SELL'">
         			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -176,6 +176,9 @@ public class StudentPaymentRouteOrderController extends BaseController {
         	studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
         }
         studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
+        if(studentPaymentRouteOrder.getSchoolId() == null){
+            studentPaymentRouteOrder.setSchoolId(999999999);
+        }
 
         return succeed(studentPaymentRouteOrderService.updateOutOrder(studentPaymentRouteOrder));
     }