feat:协议

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherSalaryDeductReasonDto.java

@@ -12,16 +12,10 @@ public class TeacherSalaryDeductReasonDto {
 
     private DeductReasonEnum deductReason;
 
-    private String deductReasonMsg;
-
-    private String deductReasonStrDesc;
-
     private BigDecimal amount;
 
     public TeacherSalaryDeductReasonDto(DeductReasonEnum deductReason, BigDecimal amount) {
         this.deductReason = deductReason;
-        this.deductReasonMsg = deductReason.getMsg();
-        this.deductReasonStrDesc = deductReason.getDesc();
         this.amount = amount.setScale(2, BigDecimal.ROUND_DOWN);
     }
 
@@ -40,20 +34,4 @@ public class TeacherSalaryDeductReasonDto {
     public void setAmount(BigDecimal amount) {
         this.amount = amount.setScale(2, BigDecimal.ROUND_DOWN);
     }
-
-    public String getDeductReasonMsg() {
-        return deductReasonMsg;
-    }
-
-    public void setDeductReasonMsg(String deductReasonMsg) {
-        this.deductReasonMsg = deductReasonMsg;
-    }
-
-    public String getDeductReasonStrDesc() {
-        return deductReasonStrDesc;
-    }
-
-    public void setDeductReasonStrDesc(String deductReasonStrDesc) {
-        this.deductReasonStrDesc = deductReasonStrDesc;
-    }
 }

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

@@ -7,22 +7,18 @@ import com.ym.mec.common.enums.BaseEnum;
  * @Date 2021/4/16 0016
  **/
 public enum DeductReasonEnum implements BaseEnum<String,DeductReasonEnum> {
-    SIGN_IN_TIME_ERR("SIGN_IN_TIME_ERR", "签到时间异常", ""),
-    SIGN_OUT_TIME_ERR("SIGN_OUT_TIME_ERR", "签退时间异常", ""),
-    GPS_ERR("GPS_ERR", "位置异常", ""),
-    NOT_SETTLEMENT("NOT_SETTLEMENT", "不结算课酬", "特殊老师不结算课酬"),
-    TRAIL("TRAIL", "试用期扣减", "试用期老师课酬按正式老师的80%计算");
+    SIGN_IN_TIME_ERR("SIGN_IN_TIME_ERR", "签到时间异常"),
+    SIGN_OUT_TIME_ERR("SIGN_OUT_TIME_ERR", "签退时间异常"),
+    GPS_ERR("GPS_ERR", "位置异常"),
+    TRAIL("TRAIL", "试用期扣减");
 
     private String code;
 
     private String msg;
 
-    private String desc;
-
-    DeductReasonEnum(String code, String msg, String desc) {
+    DeductReasonEnum(String code, String msg) {
         this.code = code;
         this.msg = msg;
-        this.desc = desc;
     }
 
     @Override
@@ -41,12 +37,4 @@ public enum DeductReasonEnum implements BaseEnum<String,DeductReasonEnum> {
     public void setMsg(String msg) {
         this.msg = msg;
     }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherIncomeQueryInfo.java

@@ -17,6 +17,8 @@ public class TeacherIncomeQueryInfo extends QueryInfo {
 
     private CourseStatusEnum courseStatus;
 
+    private Boolean updated;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -48,4 +50,12 @@ public class TeacherIncomeQueryInfo extends QueryInfo {
     public void setCourseStatus(CourseStatusEnum courseStatus) {
         this.courseStatus = courseStatus;
     }
+
+    public Boolean getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Boolean updated) {
+        this.updated = updated;
+    }
 }

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

@@ -1605,10 +1605,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
             //不结算课酬
-            List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-            deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
-            courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             return;
         }
 
@@ -1845,9 +1841,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
             //不结算课酬
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-            deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
-            courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             return;
         }
         
@@ -1955,9 +1948,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
             //不结算课酬
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-            deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
-            courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             return;
         }