update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -458,12 +458,6 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	List<CourseTeacherSalaryStatisticsDto> getTeacherMonthSalarys(@Param("teacherId") Integer teacherId,
 																  @Param("year") String year);
 
-	/**
-	 * 调整已结算的课酬
-	 * @param modifyLog
-	 */
-    void updateSalary(@Param("modifyLog") TeacherSalaryModifyLog modifyLog);
-
     /**
      * @describe 统计指定月份已开启课酬确认的数量
      * @author Joburgess

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

@@ -35,7 +35,7 @@ public class CourseScheduleTeacherSalary {
 	private String userName;
 	
 	/** 预计薪水 */
-	private java.math.BigDecimal expectSalary;
+	private java.math.BigDecimal expectSalary = BigDecimal.ZERO;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -44,13 +44,13 @@ public class CourseScheduleTeacherSalary {
 	private java.util.Date updateTime;
 	
 	/** 补贴 */
-	private java.math.BigDecimal subsidy;
+	private java.math.BigDecimal subsidy = BigDecimal.ZERO;
 	
 	/** 实际薪水 */
-	private java.math.BigDecimal actualSalary;
+	private java.math.BigDecimal actualSalary = BigDecimal.ZERO;
 
 	/** 课酬结算时计算的课酬 */
-	private java.math.BigDecimal teacherActualSalary;
+	private java.math.BigDecimal teacherActualSalary = BigDecimal.ZERO;
 	
 	/** 结算时间 */
 	private java.util.Date settlementTime;

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

@@ -511,6 +511,16 @@ public class MusicGroup {
 		this.isClassroomLessons = isClassroomLessons;
 	}
 
+	public boolean getIsClassroomLessons() {
+		return isClassroomLessons;
+	}
+
+	public void setIsClassroomLessons(boolean isClassroomLessons) {
+		this.isClassroomLessons = isClassroomLessons;
+	}
+
+
+
 	public String getMemo() {
 		return memo;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherSalaryModifyLogService.java

@@ -9,5 +9,5 @@ public interface TeacherSalaryModifyLogService extends BaseService<Long, Teacher
      * @param modifyLog
      * @return
      */
-    Object add(TeacherSalaryModifyLog modifyLog);
+    void add(TeacherSalaryModifyLog modifyLog);
 }

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

@@ -34,18 +34,23 @@ public class TeacherSalaryModifyLogServiceImpl extends BaseServiceImpl<Long, Tea
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Object add(TeacherSalaryModifyLog modifyLog) {
+	public void add(TeacherSalaryModifyLog modifyLog) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
 		}
 		//获取之前的课酬信息
 		CourseScheduleTeacherSalary salary = courseScheduleTeacherSalaryDao.queryByCourseScheduleIdAndUserId(modifyLog.getCourseScheduleId(), modifyLog.getTeacherId());
-		courseScheduleTeacherSalaryDao.updateSalary(modifyLog);
-		//修改教师课酬
-		modifyLog.setPreExpectSalary(salary.getActualSalary());
-		modifyLog.setPreReduceSalary(salary.getReduceSalary()==null? BigDecimal.ZERO:salary.getReduceSalary());
+
+		modifyLog.setPreExpectSalary(salary.getExpectSalary());
+		modifyLog.setPreReduceSalary(salary.getReduceSalary());
 		modifyLog.setOperatorId(sysUser.getId());
-		return teacherSalaryModifyLogDao.insert(modifyLog);
+		teacherSalaryModifyLogDao.insert(modifyLog);
+		//修改教师课酬
+		salary.setExpectSalary(modifyLog.getCurrentExpectSalary());
+		salary.setReduceSalary(modifyLog.getCurrentReduceSalary());
+		salary.setActualSalary(salary.getExpectSalary().subtract(salary.getReduceSalary()));
+		salary.setMemo(modifyLog.getMemo());
+		courseScheduleTeacherSalaryDao.update(salary);
 	}
 }

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

@@ -455,11 +455,6 @@
 		AND csts.teacher_role_ = 'BISHOP'
 	</update>
 
-    <update id="updateSalary" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog">
-		UPDATE course_schedule_teacher_salary SET actual_salary_ = #{modifyLog.currentExpectSalary},
-		reduce_salary = #{modifyLog.currentReduceSalary},update_time_ = NOW(),memo_ = #{modifyLog.memo}
-		WHERE course_schedule_id_ = #{modifyLog.courseScheduleId} AND user_id_ = #{modifyLog.teacherId}
-	</update>
 	<update id="updateTeacherSalaryConfirmStatus">
 		UPDATE course_schedule_teacher_salary SET confirm_status_=#{confirmStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		WHERE group_type_!='COMM'

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

@@ -38,6 +38,7 @@
         <result column="payment_valid_start_date_" property="paymentValidStartDate"/>
         <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
         <result column="payment_pattern_" property="paymentPattern"/>
+        <result column="is_classroom_lessons_" property="isClassroomLessons"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -34,8 +34,20 @@ public class RoomController{
     }
 
     @RequestMapping(value = "/statusImMsg", method = RequestMethod.POST)
-    public Object statusImMsg(@RequestBody String body){
-        log.info("statusImMsg body{}:",body);
+    public Object statusImMsg(ImMsg imMsg){
+//        log.info("statusImMsg body{}:",body);
+        String str = "timestamp=1608175805527" +
+                "&signTimestamp=1608175805527" +
+                "&nonce=1816421725" +
+                "&signature=fa06f0d300687919c8af009d4ad5f1923d753648&appKey=c9kqb3rdc451j" +
+                "&channelType=PERSON&fromUserId=325&toUserId=2109272" +
+                "&msgTimestamp=1608175805490" +
+                "&objectName=RC%3ATxtMsg" +
+                "&content=%7B%22content%22%3A%22%E5%A5%BD%22%7D" +
+                "&sensitiveType=0" +
+                "&source=iOS" +
+                "&msgUID=BMDQ-VM8C-J785-8785:";
+
         return new BaseResponse<>();
     }
 

mec-im/src/main/java/com/ym/pojo/ImMsg.java

@@ -0,0 +1,116 @@
+package com.ym.pojo;
+
+import java.util.List;
+
+//融云聊天记录
+public class ImMsg {
+    //fromUserId	String	发送用户 Id。
+    //toUserId	String	目标 Id，即为客户端 targetId，根据会话类型 channelType 的不同，可能为二人会话 Id、群聊 Id、聊天室 Id、客服 Id 等。
+    //objectName	String	消息类型，文本消息 RC:TxtMsg 、 图片消息 RC:ImgMsg 、语音消息 RC:VcMsg 、图文消息 RC:ImgTextMsg 、位置消息 RC:LBSMsg 、添加联系人消息 RC:ContactNtf 、提示条通知消息 RC:InfoNtf 、资料通知消息 RC:ProfileNtf 、通用命令通知消息 RC:CmdNtf ，详细请参见消息类型说明文档。
+    //content	String	发送消息内容，参考融云消息类型说明
+    //channelType	String	会话类型，二人会话是 PERSON 、讨论组会话是 PERSONS 、群组会话是 GROUP 、聊天室会话是 TEMPGROUP 、客服会话是 CUSTOMERSERVICE 、 系统通知是 NOTIFY 、应用公众服务是 MC 、公众服务是 MP。对应客户端 SDK 中 ConversationType 类型，二人会话是 1 、讨论组会话是 2 、群组会话是 3 、聊天室会话是 4 、客服会话是 5 、 系统通知是 6 、应用公众服务是 7 、公众服务是 8。
+    //msgTimestamp	String	服务端收到客户端发送消息时的服务器时间（1970年到现在的毫秒数）。
+    //msgUID	String	可通过 msgUID 确定消息唯一。
+    //sensitiveType	Int	消息中是否含有敏感词标识，0 为不含有敏感词，1 为含有屏蔽敏感词，2 为含有替换敏感词。消息路由功能默认含有屏蔽敏感词的消息不进行路由，可提交工单开通含有敏感词的消息路由功能，未开通情况下 sensitiveType 值默认为 0 不代表任何意义。开通后可通过该属性判断消息中是否含有敏感词。目前支持单聊、群聊、聊天室会话类型，其他会话类型默认为 0 ，开通后含有屏蔽敏感词的消息也不会进行下发，只会进行消息路由。
+    //source	String	标识消息的发送源头，包括：iOS、Android、Websocket、MiniProgram（小程序）、Server（通过 Server API 发送，需要开通 Server API 发送消息进行消息路由功能）。目前支持单聊、群聊会话类型，其他会话类型为空。
+    //groupUserIds	String[]
+    private String fromUserId;
+
+    private String toUserId;
+
+    private String objectName;
+
+    private String content;
+
+    private String channelType;
+
+    private String msgTimestamp;
+
+    private String msgUID;
+
+    private int sensitiveType;
+
+    private String source;
+
+    private List<String> groupUserIds;
+
+    public String getFromUserId() {
+        return fromUserId;
+    }
+
+    public void setFromUserId(String fromUserId) {
+        this.fromUserId = fromUserId;
+    }
+
+    public String getToUserId() {
+        return toUserId;
+    }
+
+    public void setToUserId(String toUserId) {
+        this.toUserId = toUserId;
+    }
+
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public void setObjectName(String objectName) {
+        this.objectName = objectName;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+    }
+
+    public String getMsgTimestamp() {
+        return msgTimestamp;
+    }
+
+    public void setMsgTimestamp(String msgTimestamp) {
+        this.msgTimestamp = msgTimestamp;
+    }
+
+    public String getMsgUID() {
+        return msgUID;
+    }
+
+    public void setMsgUID(String msgUID) {
+        this.msgUID = msgUID;
+    }
+
+    public int getSensitiveType() {
+        return sensitiveType;
+    }
+
+    public void setSensitiveType(int sensitiveType) {
+        this.sensitiveType = sensitiveType;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public List<String> getGroupUserIds() {
+        return groupUserIds;
+    }
+
+    public void setGroupUserIds(List<String> groupUserIds) {
+        this.groupUserIds = groupUserIds;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/TeacherSalaryModifyLogController.java

@@ -22,6 +22,7 @@ public class TeacherSalaryModifyLogController extends BaseController {
     @RequestMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('teacherSalaryModifyLog/add')")
     public Object add(TeacherSalaryModifyLog modifyLog){
-        return succeed(teacherSalaryModifyLogService.add(modifyLog));
+        teacherSalaryModifyLogService.add(modifyLog);
+        return succeed();
     }
 }