1、试听课

2、收费网管课活动

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.CourseTeacherSalaryStatisticsDto;
 import com.ym.mec.biz.dal.entity.TeacherCourseReward;
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -44,8 +45,28 @@ public interface TeacherCourseRewardDao extends BaseDAO<Long, TeacherCourseRewar
     List<TeacherCourseReward> findTeacherCourseRewards(Map<String, Object> params);
     int countTeacherCourseRewards(Map<String, Object> params);
 
+    /**
+     * @describe 获取教师指定课程组的奖励
+     * @author Joburgess
+     * @date 2020/4/24
+     * @param teacherId:
+     * @param groupId:
+     * @param groupType:
+     * @return com.ym.mec.biz.dal.entity.TeacherCourseReward
+     */
     TeacherCourseReward findTeacherCourseRewardWithGroup(@Param("teacherId") Integer teacherId,
                                                     @Param("groupId") String groupId,
                                                     @Param("groupType")GroupType groupType);
 
+    /**
+     * @describe 更新奖励的课酬确认状态
+     * @author Joburgess
+     * @date 2020/4/24
+     * @param month:
+     * @return int
+     */
+    int updateTeacherRewardConfirmStatusWithMonth(@Param("month") String month,
+                                                  @Param("teacherId") Integer teacherId,
+                                                  @Param("confirmStatus")TeacherSalaryConfirmStatus confirmStatus);
+
 }

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

@@ -2,7 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -58,7 +58,7 @@ public class CourseScheduleTeacherSalary {
 
 	private BigDecimal reduceSalary;
 
-	private YesOrNoEnum confirmStatus;
+	private TeacherSalaryConfirmStatus confirmStatus;
 
 	private String memo;
 
@@ -94,11 +94,11 @@ public class CourseScheduleTeacherSalary {
 		this.reduceSalary = reduceSalary;
 	}
 
-	public YesOrNoEnum getConfirmStatus() {
+	public TeacherSalaryConfirmStatus getConfirmStatus() {
 		return confirmStatus;
 	}
 
-	public void setConfirmStatus(YesOrNoEnum confirmStatus) {
+	public void setConfirmStatus(TeacherSalaryConfirmStatus confirmStatus) {
 		this.confirmStatus = confirmStatus;
 	}
 

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -39,6 +40,16 @@ public class TeacherCourseReward {
 
     private Date settlementDate;
 
+    private TeacherSalaryConfirmStatus confirmStatus;
+
+    public TeacherSalaryConfirmStatus getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(TeacherSalaryConfirmStatus confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
     public YesOrNoEnum getSettlementStatus() {
         return settlementStatus;
     }
@@ -172,4 +183,4 @@ public class TeacherCourseReward {
         return ToStringBuilder.reflectionToString(this);
     }
 
-}
+}

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

@@ -909,6 +909,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.CONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, teacherId, TeacherSalaryConfirmStatus.CONFIRMED);
     }
 
     @Override
@@ -1009,6 +1010,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.UNCONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED);
         String notifyUrl="8?http://mteadev.dayaedu.com/#/remuneration?month=" + month;
         String monthStr = DateUtil.dateToString(DateUtil.stringToDate(month, "yyyy-MM"),"yyyy年MM月");
         List<Integer> teacherIds = courseScheduleTeacherSalaryDao.findIsSettlementTeacherIdsWithMonth(month);
@@ -1029,5 +1031,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatusToComplied(teacherSalaryIds);
         teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED);
     }
 }

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

@@ -16,6 +16,7 @@
         <result column="memo_" jdbcType="VARCHAR" property="memo"/>
         <result column="settlement_status_" property="settlementStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="settlement_date_" property="settlementDate"/>
+        <result column="confirm_status_" property="confirmStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
@@ -87,7 +88,10 @@
                 settlement_date_ = #{settlementDate},
             </if>
             <if test="settlementStatus != null">
-                settlement_status_ = #{settlementStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                settlement_status_ = #{settlementStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="confirmStatus != null">
+                confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </set>
         where id_ = #{id,jdbcType=BIGINT}
@@ -118,6 +122,16 @@
             where id_ = #{item.id,jdbcType=BIGINT}
         </foreach>
     </update>
+    <update id="updateTeacherRewardConfirmStatusWithMonth">
+        UPDATE teacher_course_reward SET confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        WHERE DATE_FORMAT( settlement_date_, '%Y-%m-%d' ) = #{month}
+        <if test="teacherId!=null">
+            AND teacher_id_=#{teacherId}
+        </if>
+        <if test="confirmStatus==@com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus@COMPLETED">
+            AND confirm_status_=1
+        </if>
+    </update>
 
     <sql id="queryCondition">
         <where>