update 订单导出增加新生课程专享

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

@@ -30,6 +30,9 @@ public class SubjectChange {
     @ApiModelProperty(value="分部名称")
     private String organName;
 
+    @ApiModelProperty(value="原始声部id")
+    private Integer originalSubjectId;
+
     @ApiModelProperty(value="乐团id")
     private String musicGroupId;
 
@@ -70,6 +73,9 @@ public class SubjectChange {
     @ApiModelProperty(value="辅件价格")
     private BigDecimal originalAccessoriesPrice = BigDecimal.ZERO;
 
+    @ApiModelProperty(value="替换声部id")
+    private Integer changeSubjectId;
+
     /**
     * 替换课程价格
     */
@@ -472,4 +478,20 @@ public class SubjectChange {
     public void setOrganName(String organName) {
         this.organName = organName;
     }
+
+    public Integer getOriginalSubjectId() {
+        return originalSubjectId;
+    }
+
+    public void setOriginalSubjectId(Integer originalSubjectId) {
+        this.originalSubjectId = originalSubjectId;
+    }
+
+    public Integer getChangeSubjectId() {
+        return changeSubjectId;
+    }
+
+    public void setChangeSubjectId(Integer changeSubjectId) {
+        this.changeSubjectId = changeSubjectId;
+    }
 }

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

@@ -12,6 +12,7 @@
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
         <result column="cooperationOrganName" property="cooperationOrganName"/>
         <result column="music_group_id_" property="musicGroupId"/>
+        <result column="original_subject_id_" property="originalSubjectId"/>
         <result column="original_course_fee_" property="originalCourseFee"/>
         <result column="original_musical_" property="originalMusical"/>
         <result column="original_musical_price_" property="originalMusicalPrice"/>
@@ -20,6 +21,7 @@
         <result column="original_cost_" property="originalCost"/>
         <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="change_subject_id_" property="changeSubjectId"/>
         <result column="change_course_fee_" property="changeCourseFee"/>
         <result column="change_musical_" property="changeMusical"/>
         <result column="change_musical_price_" property="changeMusicalPrice"/>
@@ -40,9 +42,9 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_course_fee_, original_musical_,
+        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_subject_id_,original_course_fee_, original_musical_,
         original_musical_price_,
-        original_accessories_,original_accessories_price_,kit_group_purchase_type_, change_course_fee_, change_musical_,
+        original_accessories_,original_accessories_price_,kit_group_purchase_type_,change_subject_id_, change_course_fee_, change_musical_,
         original_cost_,change_musical_price_,change_accessories_, change_accessories_price_,change_cost_, goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,order_no_,trans_no_, status_,sell_time_,create_time_,
         update_time,version_
@@ -62,17 +64,17 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.SubjectChange"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into subject_change (student_id_,organ_id_,cooperation_organ_id_,music_group_id_,original_course_fee_,
+        insert into subject_change (student_id_,organ_id_,cooperation_organ_id_,music_group_id_,original_subject_id_,original_course_fee_,
         original_musical_,
         original_musical_price_,original_accessories_,original_accessories_price_,original_cost_,kit_group_purchase_type_,
-        change_course_fee_, change_musical_, change_musical_price_,
+        change_subject_id_,change_course_fee_, change_musical_, change_musical_price_,
         change_accessories_, change_accessories_price_, change_cost_,goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,
         order_no_,trans_no_,status_,sell_time_, create_time_, update_time,version_)
-        values (#{studentId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalCourseFee}, #{originalMusical},
+        values (#{studentId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalSubjectId},#{originalCourseFee}, #{originalMusical},
         #{originalMusicalPrice},
-        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{changeCourseFee},
-        #{changeMusical},
+        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{changeSubjectId},#{changeCourseFee}, #{changeMusical},
         #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
         #{courseMargin},#{costMargin},
         #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sellTime}, #{createTime}, #{updateTime},#{version})