Merge branch 'zx_saas_training_202303' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -36,11 +36,8 @@ public class CloudTeacherSumDto {
     @ApiModelProperty(value = "练习总人数")
     private BigDecimal trainStudentNum = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "练习时长＞60分钟的人数")
-    private BigDecimal train0 = BigDecimal.ZERO;
-
     @ApiModelProperty(value = "<10分钟")
-    private Integer train;
+    private BigDecimal train0 = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "10~60分钟")
     private Integer train1;
@@ -53,15 +50,6 @@ public class CloudTeacherSumDto {
 
     @ApiModelProperty(value = "＞=240分钟")
     private Integer train4;
-
-    public Integer getTrain() {
-        return train;
-    }
-
-    public void setTrain(Integer train) {
-        this.train = train;
-    }
-
     public BigDecimal getTrainAvgTrainTime() {
         return trainAvgTrainTime;
     }

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

@@ -436,6 +436,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             //更新 student_registration 表 expect_surplus_course_fee_预计总课费
             //更新 music_group_payment_calender_member 表 income_团练宝实际收入
             //更新 course_schedule_student_payment 表 经营报表预售、实收
+
+            //1、记录用户剩余课程费用（包含已排课或已缴费的缴费项目金额）
+            //2、学员退学后更新剩余课费
+            //3、每月结算经营报表时更新本月课程实收（actualPrice）、确认收入（expect_price_）
+
+            //实际总课费 = 已缴课费  + （云教练缴费 - 云教练成本） + （商品收入 - 商品成本）
+            //预计总课费 = 实际总课费 + 已排课未缴费
+            //应收 = 预计课费 - 实际课费
+            //实际收入 = 当月已消耗并且课程费用总和
         }
 
         ModelMap map = new ModelMap(1);

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

@@ -1174,7 +1174,6 @@
         <result property="teacherName" column="teacher_name_"/>
         <result property="normalNum" column="normal_num_"/>
         <result property="train0" column="train0"/>
-        <result property="train" column="train"/>
         <result property="train1" column="train1"/>
         <result property="train2" column="train2"/>
         <result property="train3" column="train3"/>
@@ -1184,13 +1183,12 @@
     </resultMap>
     <select id="cloudTeacherSum" resultMap="CloudTeacherSumDto">
         select o.id_ organ_id_,o.name_ organ_name_,COUNT(distinct s.user_id_) normal_num_,COUNT(distinct smcr.user_id_) train_student_num_,
-        COUNT(distinct CASE WHEN smcr.train_time_ &lt; 10 OR smcr.train_time_ IS NULL THEN s.user_id_ END) 'train',
+        COUNT(distinct CASE WHEN smcr.train_time_ > 0 AND smcr.train_time_ &lt; 10 THEN s.user_id_ END) 'train0',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 10 AND smcr.train_time_ &lt; 60 THEN s.user_id_ END) 'train1',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 60 AND smcr.train_time_ &lt; 120 THEN s.user_id_ END) 'train2',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 120 AND smcr.train_time_ &lt; 240 THEN s.user_id_ END) 'train3',
         COUNT(distinct CASE WHEN smcr.train_time_ >= 240 THEN s.user_id_ END) 'train4',
-        ROUND(SUM(smcr.train_time_),2) train_total_time_,
-        COUNT(distinct CASE WHEN smcr.train_time_ >= 60 THEN s.user_id_ END) 'train0'
+        ROUND(SUM(smcr.train_time_),2) train_total_time_
         from (select distinct sr.user_id_ from music_group mg
         left join student_registration sr ON mg.id_ = sr.music_group_id_
         where mg.status_ IN ('PROGRESS','PAUSE') AND sr.music_group_status_ = 'NORMAL') mg