关闭订单查询失败的处理

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

@@ -15,12 +15,15 @@
         <result column="original_musical_price_" property="originalMusicalPrice"/>
         <result column="original_accessories_" property="originalAccessories"/>
         <result column="original_accessories_price_" property="originalAccessoriesPrice"/>
-        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="original_cost_" property="originalCost"/>
+        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="change_course_fee_" property="changeCourseFee"/>
         <result column="change_musical_" property="changeMusical"/>
         <result column="change_musical_price_" property="changeMusicalPrice"/>
         <result column="change_accessories_" property="changeAccessories"/>
         <result column="change_accessories_price_" property="changeAccessoriesPrice"/>
+        <result column="change_cost_" property="changeCost"/>
         <result column="goods_margin_" property="goodsMargin"/>
         <result column="course_margin_" property="courseMargin"/>
         <result column="cost_margin_" property="costMargin"/>
@@ -35,11 +38,12 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_course_fee_, original_musical_, original_musical_price_,
-        original_accessories_,
-        original_accessories_price_,kit_group_purchase_type_, change_course_fee_, change_musical_, change_musical_price_,
-        change_accessories_, change_accessories_price_, goods_margin_, course_margin_,cost_margin_,sell_amount_,order_id_,order_no_,trans_no_, status_,
-        sell_time_,create_time_, update_time,version_
+        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_course_fee_, original_musical_,
+        original_musical_price_,
+        original_accessories_,original_accessories_price_,kit_group_purchase_type_, 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_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SubjectChange">
         <!--@mbg.generated-->
@@ -56,14 +60,19 @@
     <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_, original_musical_,
-        original_musical_price_,original_accessories_,original_accessories_price_,kit_group_purchase_type_,
+        insert into subject_change (student_id_,organ_id_,cooperation_organ_id_,music_group_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_accessories_, change_accessories_price_, goods_margin_, course_margin_,cost_margin_,sell_amount_,order_id_,
+        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}, #{originalMusicalPrice},
-        #{originalAccessories}, #{originalAccessoriesPrice},#{kitGroupPurchaseType},#{changeCourseFee}, #{changeMusical},
-        #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice}, #{goodsMargin}, #{courseMargin},#{costMargin}
+        values (#{studentId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalCourseFee}, #{originalMusical},
+        #{originalMusicalPrice},
+        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType},#{changeCourseFee},
+        #{changeMusical},
+        #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
+        #{courseMargin},#{costMargin}
         #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status},#{sellTime}, #{createTime}, #{updateTime},0)
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
@@ -94,6 +103,9 @@
             <if test="originalAccessoriesPrice != null">
                 original_accessories_price_ = #{originalAccessoriesPrice},
             </if>
+            <if test="originalCost != null">
+                original_cost_ = #{originalCost},
+            </if>
             <if test="changeCourseFee != null">
                 change_course_fee_ = #{changeCourseFee},
             </if>
@@ -109,6 +121,9 @@
             <if test="changeAccessoriesPrice != null">
                 change_accessories_price_ = #{changeAccessoriesPrice},
             </if>
+            <if test="changeCost != null">
+                change_cost_ = #{changeCost},
+            </if>
             <if test="goodsMargin != null">
                 goods_margin_ = #{goodsMargin},
             </if>
@@ -155,13 +170,16 @@
     </select>
 
     <select id="getChangeInfo" resultMap="SubjectChange">
-        SELECT sc.*,su.username_ studentName
+        SELECT sc.*, su.username_ studentName
         FROM subject_change sc
-        LEFT jOIN sys_user su ON su.id_=sc.student_id_
+                 LEFT jOIN sys_user su ON su.id_ = sc.student_id_
         WHERE sc.id_ = #{id}
     </select>
 
     <select id="getMusicGroupWaitPay" resultMap="SubjectChange">
-        SELECT * FROM subject_change WHERE music_group_id_ = #{musicGroupId} AND status_ = 0
+        SELECT *
+        FROM subject_change
+        WHERE music_group_id_ = #{musicGroupId}
+          AND status_ = 0
     </select>
 </mapper>