Merge branch 'feature/0529-live' into master_saas

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/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"/>
@@ -245,13 +246,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 +329,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>