Browse Source

feat:课酬推送

Joburgess 4 years ago
parent
commit
b357b16c82

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

@@ -167,7 +167,9 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_MUSIC_GROUP_PARENT_MEETING_NOTICE("SMS_MUSIC_GROUP_PARENT_MEETING_NOTICE","乐团家长会通知"),
     SMS_INSPECTION_NOTICE("SMS_INSPECTION_NOTICE","巡查日程提醒"),
     TEACHER_SERVE_PUSH("TEACHER_SERVE_PUSH", "服务指标未完成提醒"),
-    MAINTENANCE_NOTICE_PUSH("MAINTENANCE_NOTICE_PUSH", "乐保到期提醒");
+    MAINTENANCE_NOTICE_PUSH("MAINTENANCE_NOTICE_PUSH", "乐保到期提醒"),
+
+    TEACHER_INCOME_REMIND("TEACHER_INCOME_REMIND", "今日收入");
 
 
 

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -2076,6 +2077,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(CollectionUtils.isEmpty(teacherIds)){
             return;
         }
-
+        Map<Integer, String> userMap = new HashMap<>();
+        for (Integer teacherId : teacherIds) {
+            userMap.put(teacherId, teacherId.toString());
+        }
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_INCOME_REMIND,
+                userMap, null, 0, "12?", "TEACHER");
     }
 }

+ 4 - 0
mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -177,4 +177,8 @@ public interface TaskRemoteService {
 	//更新学员指导老师和声部信息
 	@GetMapping("task/updateStudentTeacherAndSubject")
 	void updateStudentTeacherAndSubject();
+
+	//推送查看今日收入提醒
+	@GetMapping("task/todayIncomeRemind")
+	void todayIncomeRemind();
 }

+ 19 - 0
mec-task/src/main/java/com/ym/mec/task/jobs/TodayIncomeRemindTask.java

@@ -0,0 +1,19 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TodayIncomeRemindTask extends BaseTask {
+
+    @Autowired
+    private TaskRemoteService taskRemoteService;
+
+    @Override
+    public void execute() throws TaskException {
+        taskRemoteService.todayIncomeRemind();
+    }
+}

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -366,4 +366,10 @@ public class TaskController extends BaseController {
 	public void updateStudentTeacherAndSubject(){
 		studentService.updateStudentTeacherAndSubject();
 	}
+
+	//推送查看今日收入提醒
+	@GetMapping("/todayIncomeRemind")
+	public void todayIncomeRemind(){
+		courseScheduleTeacherSalaryService.todayIncomeRemind();
+	}
 }