Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseScheduleStudentPayment.java

@@ -59,6 +59,10 @@ public class CourseScheduleStudentPayment implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updatedTime;
 
+    @TableField("course_type_")
+    @ApiModelProperty(value = "类型 practice陪练课 live直播课")
+    private String courseType;
+
 
     public Long getId() {
         return id;
@@ -140,5 +144,13 @@ public class CourseScheduleStudentPayment implements Serializable {
         this.updatedTime = updatedTime;
     }
 
+    public String getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(String courseType) {
+        this.courseType = courseType;
+    }
+
 }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -12,21 +12,23 @@
         <result column="actual_price_" jdbcType="VARCHAR" property="actualPrice"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="updated_time_" jdbcType="TIMESTAMP" property="updatedTime"/>
+        <result column="course_type_" jdbcType="VARCHAR" property="courseType"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id_
-        , user_id_, course_group_id_, course_id_, order_no_, original_price_, expect_price_, actual_price_, created_time_, updated_time_
+        , user_id_, course_group_id_, course_id_, order_no_, original_price_, expect_price_, actual_price_, created_time_, updated_time_, course_type_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment">
         insert into course_schedule_student_payment(user_id_, course_group_id_, course_id_, order_no_, original_price_,
-        expect_price_, actual_price_, created_time_, updated_time_)
+        expect_price_, actual_price_, created_time_, updated_time_, course_type_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.userId}, #{entity.courseGroupId}, #{entity.courseId}, #{entity.orderNo}, #{entity.originalPrice},
-            #{entity.expectPrice}, #{entity.actualPrice}, #{entity.createdTime}, #{entity.updatedTime})
+            #{entity.expectPrice}, #{entity.actualPrice}, #{entity.createdTime}, #{entity.updatedTime},
+            #{entity.courseType})
         </foreach>
     </insert>
     <select id="queryStudentIds" resultType="java.lang.Integer">