Merge remote-tracking branch 'origin/master'

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

@@ -676,7 +676,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //更新教师结算信息
             courseScheduleTeacherSalary.setActualSalary(finalSalary.compareTo(BigDecimal.ZERO)<0?BigDecimal.ZERO:finalSalary);
             courseScheduleTeacherSalary.setSettlementTime(now);
-            courseScheduleTeacherSalary.setDeductionReason(org.apache.commons.lang3.StringUtils.join(deductReasons));
+            courseScheduleTeacherSalary.setDeductionReason(org.apache.commons.lang3.StringUtils.join(deductReasons, ";"));
             courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
         }
     }

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

@@ -279,13 +279,13 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
         studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
-        if(BigDecimal.ZERO.compareTo(degreeRegistration.getMoney())<0){
+        if(Objects.nonNull(degreeRegistration.getSporadicId())){
             courseInfos.add("乐器" + degreeRegistration.getLevel() + ",费用：" + degreeRegistration.getMoney());
         }
-        if (degreeRegistration.getTheoryMoney().compareTo(BigDecimal.ZERO) > 0) {
+        if (StringUtils.isNotBlank(degreeRegistration.getTheoryLevel())) {
             courseInfos.add("乐理" + degreeRegistration.getTheoryLevel() + ",费用：" + degreeRegistration.getTheoryMoney());
         }
-        studentPaymentOrder.setMemo(StringUtils.join(courseInfos, ","));
+        studentPaymentOrder.setMemo(StringUtils.join(courseInfos, "；"));
         studentPaymentOrderService.insert(studentPaymentOrder);
         studentPaymentOrder.setVersion(0);
 
@@ -345,6 +345,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             throw new BizException("订单更新失败");
         }
 
+        if(Objects.isNull(studentPaymentOrder.getClassGroupId())){
+            return true;
+        }
+
         if (degree == null || !degree.getStatus().equals(1)) {
             studentPaymentOrder.setMemo("订单状态已变更");
             studentPaymentOrder.setVersion(studentPaymentOrder.getVersion()+1);