会员拆分

mec-application/src/main/resources/exportColumnMapper.ini

@@ -372,7 +372,7 @@ fieldColumns = ["organName","musicGroupName","musicGroupId","studentId","student
 
 [云教练待激活明细]
 headColumns = ["分部","学员编号","学员姓名","手机号","学员声部","学练宝版本","学练宝类型","数量","缴费金额（元）","状态","取消原因","操作人","操作时间","获得资格时间"]
-fieldColumns = ["organName","studentId","name","phone","subjectName","type.msg","time","amount","status == 1 ? '待激活':'已取消'","cancelReason","operatorName","operateTime","createTime"]
+fieldColumns = ["organName","studentId","name","phone","subjectName","memberName","type.msg","time","amount","status == 1 ? '待激活':'已取消'","cancelReason","operatorName","operateTime","createTime"]
 
 [平衡关系-乐团课]
 headColumns = ["分部","乐团名称","乐团编号","班级名称","班级类型","班级编号","课程类型","剩余课次","剩余课次课酬","剩余被合并课次","剩余被合并课次课酬","已上课次","已上课次课酬","已上被合并课次","已上被合并课次课酬","当月新增","当月新增课酬","当月被合并新增","当月被合并新增课酬","当月消耗","当月消耗课酬","当月被合并消耗","当月被合并消耗课酬"]

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderBase.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Data
 public class MusicGroupPaymentCalenderBase extends BaseEntity {
-    private long id;
+    private Long id;
 
     @ApiModelProperty(value = "数量", required = false)
     private BigDecimal num;

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

@@ -337,7 +337,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setLevel(calenderMember.getMemberRankSettingId());
             cloudTeacherOrder.setTime(calenderMember.getNum().intValue());
             cloudTeacherOrder.setType(calenderMember.getPeriod());
-            BigDecimal decimal = cloudTeacherFee.get(calenderMember.getMemberRankSettingId());
+            BigDecimal decimal = cloudTeacherFee.get(calenderMember.getId().intValue());
             cloudTeacherOrder.setAmount(decimal);
             cloudTeacherOrder.setStudentId(order.getUserId());
             cloudTeacherOrder.setStatus(1);

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

@@ -206,7 +206,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 }
                 if (studentCloudTeacherMap.containsKey(e.getStudentId())) {
                     List<CloudTeacherOrder> cloudTeacherOrders = studentCloudTeacherMap.get(e.getStudentId());
-                    if (cloudTeacherOrders != null && cloudTeacherOrders.size() > 0) {
+                    if (CollectionUtils.isNotEmpty(cloudTeacherOrders)) {
                         BigDecimal cloudAmount = BigDecimal.ZERO;
                         for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
                             if (cloudTeacherOrder.getEndTime() == null || DateUtil.stringToDate(DateUtil.format(cloudTeacherOrder.getEndTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT), DateUtil.ISO_EXPANDED_DATE_FORMAT).compareTo(