feat:教师端课酬

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

@@ -0,0 +1,45 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/4/15 0015
+ */
+public class TeacherIncomeDto {
+
+    @ApiModelProperty(value = "总收入")
+    private BigDecimal totalIncome = new BigDecimal("0");
+
+    @ApiModelProperty(value = "本月预计收入")
+    private BigDecimal thisMonthExpectIncome = new BigDecimal("0");
+
+    @ApiModelProperty(value = "本月实际课耗收入")
+    private BigDecimal thisMonthActualIncome = new BigDecimal("0");
+
+    public BigDecimal getTotalIncome() {
+        return totalIncome;
+    }
+
+    public void setTotalIncome(BigDecimal totalIncome) {
+        this.totalIncome = totalIncome;
+    }
+
+    public BigDecimal getThisMonthExpectIncome() {
+        return thisMonthExpectIncome;
+    }
+
+    public void setThisMonthExpectIncome(BigDecimal thisMonthExpectIncome) {
+        this.thisMonthExpectIncome = thisMonthExpectIncome;
+    }
+
+    public BigDecimal getThisMonthActualIncome() {
+        return thisMonthActualIncome;
+    }
+
+    public void setThisMonthActualIncome(BigDecimal thisMonthActualIncome) {
+        this.thisMonthActualIncome = thisMonthActualIncome;
+    }
+}

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.CourseSalaryQueryInfo4Web;
 import com.ym.mec.biz.dal.page.CourseScheduleTeacherSalaryQueryInfo;
 import com.ym.mec.biz.dal.page.ExportTeacherSalaryQueryInfo;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.math.BigDecimal;
@@ -215,4 +216,6 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @return void
      */
     List<BigDecimal> salaryComposition(List<BigDecimal> salaries, BigDecimal targetSalary);
+
+    void queryTeacherIncomeList(QueryInfo queryInfo);
 }

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

@@ -14,6 +14,7 @@ import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
@@ -264,7 +265,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 trail = false;
             }
 
-
             //如果上课日期在试用期内按80%结算
             if(trail){
                 expectSalary = expectSalary.multiply(new BigDecimal("0.8"));
@@ -1479,4 +1479,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
         return result.get(0).get(target);
     }
+
+    @Override
+    public void queryTeacherIncomeList(QueryInfo queryInfo) {
+        
+    }
 }