Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -32,6 +32,9 @@ public class StudentVipGroupShowListDto {
     @ApiModelProperty(value = "线下课课时数", required = false)
     private Integer offlineClassesNum;
 
+    @ApiModelProperty(value = "原价",required = false)
+    private BigDecimal originalTotalPrice;
+
     @ApiModelProperty(value = "学生购买价格",required = false)
     private BigDecimal totalPrice;
 

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

@@ -83,6 +83,10 @@ public class VipGroup extends BaseEntity {
 	@ApiModelProperty(value = "课程总价",required = false)
 	private BigDecimal totalPrice = new BigDecimal(0);
 
+
+    @ApiModelProperty(value = "课程总原价",required = false)
+    private BigDecimal originalTotalPrice = new BigDecimal(0);
+
 	@ApiModelProperty(value = "审批状态",required = false)
 	private AuditStatusEnum auditStatus;
 

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

@@ -4576,14 +4576,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                             courseScheduleStudentPayments.add(courseScheduleStudentPayment);
                         }
                         userRoleMap.put(classGroupStudent.getUserId(), null);
-                        studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
+                    }
+                    studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 
-                        courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
+                    courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 
-                        imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(),
-                                vipGroup.getName(), null, null, vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
-                        imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
-                    }
+                    imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(),
+                            vipGroup.getName(), null, null, vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
+                    imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
                     imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
                 }
                 vipGroupDao.update(vipGroup);

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

@@ -4333,7 +4333,7 @@
 
     <update id="updateRemindStatus">
         update course_schedule
-        set live_remind_ = 1
+        set live_remind_ = 1,status_ = 'UNDERWAY'
         where id_  in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}

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

@@ -29,6 +29,7 @@
         <result column="online_classes_unit_price_" property="onlineClassesUnitPrice"/>
         <result column="offline_classes_unit_price_" property="offlineClassesUnitPrice"/>
         <result column="total_price_" property="totalPrice"/>
+        <result column="original_total_price_" property="originalTotalPrice"/>
         <result column="student_num_" property="studentNum"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="current_class_times_" property="currentClassTimes"/>
@@ -114,6 +115,7 @@
         <result column="online_classes_num_" property="onlineClassesNum"/>
         <result column="offline_classes_num_" property="offlineClassesNum"/>
         <result column="total_price_" property="totalPrice"/>
+        <result column="original_total_price_" property="originalTotalPrice"/>
         <result column="expect_student_num_" property="expectStudentNum"/>
         <result column="student_num_" property="studentNum"/>
         <result column="user_id_" property="teacherId"/>
@@ -245,13 +247,13 @@
          update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,
          name_,organ_id_list_,vip_group_activity_id_,group_status_,online_classes_unit_price_,offline_classes_unit_price_,
          total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_,memo_,audit_status_,courses_start_date,
-         course_schedules_json_,student_id_list_,tenant_id_, group_type_, live_config_json_)
+         course_schedules_json_,student_id_list_,tenant_id_, group_type_, live_config_json_,original_total_price_)
         VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},
                #{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},
                #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},
                #{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason},#{memo},
                #{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson},#{studentIdList},#{tenantId},
-               #{groupType}, #{liveConfigJson})
+               #{groupType}, #{liveConfigJson},#{originalTotalPrice})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -328,6 +330,9 @@
             <if test="educationalTeacherId!=null">
                 educational_teacher_id_=#{educationalTeacherId},
             </if>
+            <if test="originalTotalPrice != null">
+                original_total_price_=#{originalTotalPrice},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -445,6 +450,7 @@
         vg.courses_start_date,
         vg.online_classes_num_,
         vg.offline_classes_num_,
+        vg.original_total_price_,
         vg.total_price_,
         cg.expect_student_num_,
         cg.student_num_,
@@ -477,6 +483,7 @@
         vg.online_classes_num_,
         vg.offline_classes_num_,
         vg.total_price_,
+        vg.original_total_price_,
         cg.expect_student_num_,
         cg.student_num_,
         su.real_name_ teacher_name_,