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

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

@@ -7,12 +7,23 @@ import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.common.enums.BaseEnum;
 
 /**
  * 对应数据库表(music_group_payment_calender):
  */
 public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCalender> {
 
+	public enum FeeType implements BaseEnum<String, FeeType> {
+		OFFLINE, ONLINE, ALL;
+
+		@Override
+		public String getCode() {
+			return this.name();
+		}
+
+	}
+
 	/**  */
 	private Long id;
 
@@ -27,16 +38,18 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 	/** 开始缴费日期 */
 	@ApiModelProperty(value = "开始缴费日期", required = false)
 	private java.util.Date startPaymentDate;
-	
+
 	private Date deadlinePaymentDate;
-	
+
 	private PaymentStatusEnum paymentStatus;
-	
+
 	private Integer expectNum;
-	
+
 	private Integer actualNum;
-	
+
 	private String memo;
+	
+	private FeeType type;
 
 	/**  */
 	private java.util.Date createTime;
@@ -132,6 +145,14 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 		this.memo = memo;
 	}
 
+	public FeeType getType() {
+		return type;
+	}
+
+	public void setType(FeeType type) {
+		this.type = type;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -99,6 +99,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         //4、调整未上课课酬
         List<ClassGroupTeacherMapper> classGroupTeachers = classGroupTeacherMapperService.getClassGroupTeachers(classGroupId);
         if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && courseScheduleList.size() > 0) {
+            studentNum -= 1;
             Date nowDate = new Date();
             List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
             List<Long> courseScheduleIds = courseScheduleList.stream().map(CourseSchedule::getId).collect(Collectors.toList());
@@ -110,9 +111,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                         throw new BizException("请设置老师线上网管课课酬");
                     }
                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
-
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(courseSchedule.getType());
-                    studentNum -= 1;
                     BigDecimal salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();

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

@@ -204,7 +204,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                     teacherDefaultMusicGroupSalary = teacherDefaultSalary.get(classGroupNoStartCourseSchedule.getType().getCode() + classGroupTeacherMapper.getUserId());
                 }
                 if (teacherDefaultMusicGroupSalary == null) {
-                    throw new BizException("请先设置老师课酬");
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    throw new BizException("请设置"+teacher.getRealName()+"老师"+classGroupNoStartCourseSchedule.getType().getMsg()+"课酬");
                 }
 
                 //对应基准课酬

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

@@ -96,7 +96,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         ) {
             throw new BizException("邮寄信息必填");
         }
-        SysUser student =  sysUserFeignService.queryUserById(repairInfo.getStudentId());
+        SysUser student = sysUserFeignService.queryUserById(repairInfo.getStudentId());
         repairInfo.setOrganId(student.getOrganId());
 
         Date date = new Date();
@@ -211,25 +211,26 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentRepair.setDescription(description);
         studentRepairDao.update(studentRepair);
 
-        SysUser student =  sysUserFeignService.queryUserById(studentRepair.getStudentId());
-        Map<Integer, String> map = new HashMap();
-        map.put(student.getId(), student.getId().toString());
-
-        String imContent = student.getUsername() + "您的乐器已保养维修完毕，请安排时间来维修点取回\n\r" +
-                "联系人：" + studentRepair.getEmployeePhone() + "（" + studentRepair.getEmployeePhone() + "）\n\r" +
-                "地址：" + studentRepair.getEmployeeAddress() ;
-
-        if(studentRepair.getSendType().equals(0)) {
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_UNSEND_COMPLETED, map, null, 0, "1", "STUDENT",
-                    student.getUsername(), studentRepair.getEmployeeName(), studentRepair.getEmployeePhone(), studentRepair.getEmployeeAddress());
-        }else {
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_SEND_COMPLETED, map, null, 0, "1", "STUDENT",
-                    student.getUsername());
-            imContent = student.getUsername() + "学员您好,您的乐器已保养维修完毕，快递已寄出，请注意查收。";
-        }
-
-        sysMessageService.sendPrivateMessage(student.getId().toString(), imContent);
+        if (repairStatus != null) {
+            SysUser student = sysUserFeignService.queryUserById(studentRepair.getStudentId());
+            Map<Integer, String> map = new HashMap();
+            map.put(student.getId(), student.getId().toString());
+
+            String imContent = student.getUsername() + "您的乐器已保养维修完毕，请安排时间来维修点取回\n" +
+                    "联系人：" + studentRepair.getEmployeeName() + "（" + studentRepair.getEmployeePhone() + "）\n" +
+                    "地址：" + studentRepair.getEmployeeAddress();
+
+            if (studentRepair.getSendType().equals(0)) {
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_UNSEND_COMPLETED, map, null, 0, "1", "STUDENT",
+                        student.getUsername(), studentRepair.getEmployeeName(), studentRepair.getEmployeePhone(), studentRepair.getEmployeeAddress());
+            } else {
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_SEND_COMPLETED, map, null, 0, "1", "STUDENT",
+                        student.getUsername());
+                imContent = student.getUsername() + "学员您好,您的乐器已保养维修完毕，快递已寄出，请注意查收。";
+            }
 
+            sysMessageService.sendPrivateMessage(student.getId().toString(), imContent);
+        }
         log.info("操作人 :" + sysUser.getId());
     }
 
@@ -367,7 +368,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         }
         //更新维修单信息
         StudentRepair repairInfo = getRepairInfo(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
-        if(repairInfo == null){
+        if (repairInfo == null) {
             throw new BizException("维修单不存在");
         }
 
@@ -422,18 +423,18 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
             String imContent = repairInfo.getStudentName() + "学员您好，您的乐器维修已受理，我们会尽快完成保养维修";
 
-            if(repairInfo.getType().equals(1)){ //线上
-                imContent = repairInfo.getStudentName() + "学员您好，请尽快寄送乐器至维修点，我们会尽快完成保养维修\n\r" +
-                        "联系人：" + repairInfo.getEmployeePhone() + "（" + repairInfo.getEmployeePhone() + "）\n\r" +
+            if (repairInfo.getType().equals(1)) { //线上
+                imContent = repairInfo.getStudentName() + "学员您好，请尽快寄送乐器至维修点，我们会尽快完成保养维修\n" +
+                        "联系人：" + repairInfo.getEmployeeName() + "（" + repairInfo.getEmployeePhone() + "）\n" +
                         "地址：" + repairInfo.getEmployeeAddress() + "";
 
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_ONLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
                         repairInfo.getStudentName(), repairInfo.getEmployeeName(), repairInfo.getEmployeePhone(), repairInfo.getEmployeeAddress());
-            }else {
+            } else {
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
                         repairInfo.getStudentName());
             }
-            sysMessageService.sendNoAuthPrivateMessage(repairInfo.getEmployeeId().toString(),userId.toString(), imContent);
+            sysMessageService.sendNoAuthPrivateMessage(repairInfo.getEmployeeId().toString(), userId.toString(), imContent);
             return true;
         }
 

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

@@ -150,6 +150,7 @@
         SELECT sr.*,o.name_ FROM student_repair sr
         LEFT JOIN organization o ON o.id_ = sr.organ_id_
         <include refid="queryPageSql"/>
+        ORDER BY id_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="queryPageSql">