add 添加获取学生维修技师接口

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -144,7 +144,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_SALARY_CONFIRM_PUSH("TEACHER_SALARY_CONFIRM_PUSH", "课酬确认"),
 
     SMS_REPAIR_ONLINE_PAYMENT_SUCCESS("SMS_REPAIR_ONLINE_PAYMENT_SUCCESS","乐器线上维修支付成功"),
-    SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS("SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS","乐器线下维修支付成功");
+    SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS("SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS","乐器线下维修支付成功"),
+    SMS_REPAIR_UNSEND_COMPLETED("SMS_REPAIR_UNSEND_COMPLETED","乐器维修完成自取"),
+    SMS_REPAIR_SEND_COMPLETED("SMS_REPAIR_SEND_COMPLETED","乐器维修完成邮寄");
+
 
 
     MessageTypeEnum(String code, String msg) {

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

@@ -184,7 +184,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        StudentRepair studentRepair = studentRepairDao.get(id);
+        StudentRepair studentRepair = studentRepairDao.getRepairInfo(id);
         if (studentRepair == null) {
             throw new BizException("维修信息不存在");
         }
@@ -195,6 +195,25 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentRepair.setUpdateTime(new Date());
         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);
+
         log.info("操作人 :" + sysUser.getId());
     }
 
@@ -333,16 +352,13 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         Integer userId = studentPaymentOrder.getUserId();
         SysUser sysUser = sysUserFeignService.queryUserById(userId);
 
-
         Map<Integer, String> map = new HashMap();
-        map.put(userId, sysUser.getPhone());
-        Map<Integer, String> yimei = new HashMap();
         map.put(userId, userId.toString());
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             repairInfo.setPayStatus(2);
             repairInfo.setUpdateTime(noDate);
-            if(this.update(repairInfo) <= 0){
+            if (this.update(repairInfo) <= 0) {
                 throw new BizException("维修单更新失败");
             }
 
@@ -384,20 +400,27 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             }
             sysUserCashAccountDetailService.insert(paymentDetail);
 
+            String imContent = sysUser.getUsername() + "学员您好，您的乐器维修已受理，我们会尽快完成保养维修";
+
             if(repairInfo.getType().equals(0)) {
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
                         sysUser.getUsername());
-            }else {
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
-                        sysUser.getUsername(),repairInfo.getContactName(),repairInfo.getContactMobile(),repairInfo.getAddress());
+            } else {
+                imContent = sysUser.getUsername() + "学员您好，请尽快寄送乐器至维修点，我们会尽快完成保养维修\n\r" +
+                        "联系人：" + repairInfo.getEmployeePhone() + "（" + repairInfo.getEmployeePhone() + "）\n\r" +
+                        "地址：" + repairInfo.getEmployeeAddress() + "";
+
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_ONLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
+                        sysUser.getUsername(), repairInfo.getEmployeeName(), repairInfo.getEmployeePhone(), repairInfo.getEmployeeAddress());
             }
+            sysMessageService.sendPrivateMessage(sysUser.getId().toString(), imContent);
             return true;
         }
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
             repairInfo.setPayStatus(0);
             repairInfo.setUpdateTime(noDate);
-            if(this.update(repairInfo) <= 0){
+            if (this.update(repairInfo) <= 0) {
                 throw new BizException("维修单更新失败");
             }
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {