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

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

@@ -4,129 +4,133 @@ import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-@ApiModel(value="com-ym-SubjectChange")
+@ApiModel(value = "com-ym-SubjectChange")
 public class SubjectChange {
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private Integer id;
 
-    @ApiModelProperty(value="合作单位id")
+    @ApiModelProperty(value = "合作单位id")
     private Integer cooperationOrganId;
 
-    @ApiModelProperty(value="合作单位名称")
+    @ApiModelProperty(value = "合作单位名称")
     private String cooperationOrganName;
 
-    @ApiModelProperty(value="学生id")
+    @ApiModelProperty(value = "教务id")
+    private Integer eduTeacherId;
+
+    @ApiModelProperty(value = "学生id")
     private Integer studentId;
 
     private String studentName;
 
-    @ApiModelProperty(value="分部id")
+    @ApiModelProperty(value = "分部id")
     private Integer organId;
 
-    @ApiModelProperty(value="分部名称")
+    @ApiModelProperty(value = "分部名称")
     private String organName;
 
-    @ApiModelProperty(value="原始声部id")
+    @ApiModelProperty(value = "原始声部id")
     private Integer originalSubjectId;
 
-    @ApiModelProperty(value="乐团id")
+    @ApiModelProperty(value = "乐团id")
     private String musicGroupId;
 
     /**
-    * 原始课程费用
-    */
-    @ApiModelProperty(value="原始课程费用")
+     * 原始课程费用
+     */
+    @ApiModelProperty(value = "原始课程费用")
     private BigDecimal originalCourseFee = BigDecimal.ZERO;
 
-    @ApiModelProperty(value="乐器购买方式")
+    @ApiModelProperty(value = "乐器购买方式")
     private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
 
     /**
-    * 原始乐器编号
-    */
-    @ApiModelProperty(value="原始乐器编号")
+     * 原始乐器编号
+     */
+    @ApiModelProperty(value = "原始乐器编号")
     private Integer originalMusical;
 
     private Goods originalMusicalGoods;
 
     /**
-    * 原始乐器价格
-    */
-    @ApiModelProperty(value="原始乐器价格")
+     * 原始乐器价格
+     */
+    @ApiModelProperty(value = "原始乐器价格")
     private BigDecimal originalMusicalPrice = BigDecimal.ZERO;
 
     /**
-    * 辅件ids
-    */
-    @ApiModelProperty(value="辅件ids")
+     * 辅件ids
+     */
+    @ApiModelProperty(value = "辅件ids")
     private String originalAccessories;
 
     private List<Goods> originalAccessoriesGoods;
 
     /**
-    * 辅件价格
-    */
-    @ApiModelProperty(value="辅件价格")
+     * 辅件价格
+     */
+    @ApiModelProperty(value = "辅件价格")
     private BigDecimal originalAccessoriesPrice = BigDecimal.ZERO;
 
-    @ApiModelProperty(value="替换声部id")
+    @ApiModelProperty(value = "替换声部id")
     private Integer changeSubjectId;
 
     /**
-    * 替换课程价格
-    */
-    @ApiModelProperty(value="替换课程价格")
+     * 替换课程价格
+     */
+    @ApiModelProperty(value = "替换课程价格")
     private BigDecimal changeCourseFee = BigDecimal.ZERO;
 
     /**
-    * 替换乐器
-    */
-    @ApiModelProperty(value="替换乐器")
+     * 替换乐器
+     */
+    @ApiModelProperty(value = "替换乐器")
     private Integer changeMusical;
 
     private Goods changeMusicalGoods;
 
 
     /**
-    * 替换乐器价格
-    */
-    @ApiModelProperty(value="替换乐器价格")
+     * 替换乐器价格
+     */
+    @ApiModelProperty(value = "替换乐器价格")
     private BigDecimal changeMusicalPrice = BigDecimal.ZERO;
 
     /**
-    * 替换辅件
-    */
-    @ApiModelProperty(value="替换辅件")
+     * 替换辅件
+     */
+    @ApiModelProperty(value = "替换辅件")
     private String changeAccessories;
     private List<Goods> changeAccessoriesGoods;
 
 
     /**
-    * 替换辅件价格
-    */
-    @ApiModelProperty(value="替换辅件价格")
+     * 替换辅件价格
+     */
+    @ApiModelProperty(value = "替换辅件价格")
     private BigDecimal changeAccessoriesPrice = BigDecimal.ZERO;
 
     /**
-    * 乐器辅件差额
-    */
-    @ApiModelProperty(value="乐器辅件差额")
+     * 乐器辅件差额
+     */
+    @ApiModelProperty(value = "乐器辅件差额")
     private BigDecimal goodsMargin;
 
     /**
-    * 课程差额
-    */
-    @ApiModelProperty(value="课程差额")
+     * 课程差额
+     */
+    @ApiModelProperty(value = "课程差额")
     private BigDecimal courseMargin;
 
     /**
      * 成本差额
      */
-    @ApiModelProperty(value="成本差额")
+    @ApiModelProperty(value = "成本差额")
     private BigDecimal costMargin;
 
 
@@ -136,9 +140,9 @@ public class SubjectChange {
     private BigDecimal sellAmount;
 
     /**
-    * 状态
-    */
-    @ApiModelProperty(value="状态")
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
     private SubjectChangeStatusEnum status;
 
     /**
@@ -157,30 +161,41 @@ public class SubjectChange {
     private String transNo;
 
     /**
+     * 交易方式
+     */
+    @ApiModelProperty(value = "交易方式")
+    private String paymentChannel;
+
+    /**
+     * 收款账户
+     */
+    @ApiModelProperty(value = "收款账户")
+    private String merNo;
+
+    /**
      * 销售时间
      */
-    @ApiModelProperty(value="销售时间")
+    @ApiModelProperty(value = "销售时间")
     private Date sellTime;
 
-
     /**
-    * 创建时间
-    */
-    @ApiModelProperty(value="创建时间")
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
-    * 修改时间
-    */
-    @ApiModelProperty(value="修改时间")
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     private Integer version;
 
-    @ApiModelProperty(value="原始成本")
+    @ApiModelProperty(value = "原始成本")
     private BigDecimal originalCost = BigDecimal.ZERO;
 
-    @ApiModelProperty(value="更改后成本")
+    @ApiModelProperty(value = "更改后成本")
     private BigDecimal changeCost = BigDecimal.ZERO;
 
     public Integer getId() {
@@ -494,4 +509,28 @@ public class SubjectChange {
     public void setChangeSubjectId(Integer changeSubjectId) {
         this.changeSubjectId = changeSubjectId;
     }
+
+    public Integer getEduTeacherId() {
+        return eduTeacherId;
+    }
+
+    public void setEduTeacherId(Integer eduTeacherId) {
+        this.eduTeacherId = eduTeacherId;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
+
+    public String getMerNo() {
+        return merNo;
+    }
+
+    public void setMerNo(String merNo) {
+        this.merNo = merNo;
+    }
 }

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

@@ -175,6 +175,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
     @Override
     public SubjectChange addChange(SubjectChange subjectChange) {
         Date nowDate = new Date();
+        MusicGroup musicGroup = musicGroupDao.get(subjectChange.getMusicGroupId());
+        subjectChange.setOrganId(musicGroup.getOrganId());
+        subjectChange.setEduTeacherId(musicGroup.getEducationalTeacherId());
         subjectChange.setCourseMargin(subjectChange.getChangeCourseFee().subtract(subjectChange.getOriginalCourseFee()));
         BigDecimal goodsMargin = subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())
                 .subtract(subjectChange.getOriginalMusicalPrice()).subtract(subjectChange.getOriginalAccessoriesPrice());

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

@@ -5,6 +5,7 @@
         <!--@mbg.generated-->
         <!--@Table subject_change-->
         <id column="id_" property="id"/>
+        <result column="edu_teacher_id_" property="eduTeacherId"/>
         <result column="student_id_" property="studentId"/>
         <result column="studentName" property="studentName"/>
         <result column="organ_id_" property="organId"/>
@@ -35,6 +36,8 @@
         <result column="order_id_" property="orderId"/>
         <result column="order_no_" property="orderNo"/>
         <result column="trans_no_" property="transNo"/>
+        <result column="payment_channel_" property="paymentChannel"/>
+        <result column="mer_no_" property="merNo"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -42,11 +45,14 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_subject_id_,original_course_fee_, original_musical_,
+        id_,edu_teacher_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_subject_id_, 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_,
+        course_margin_,cost_margin_,sell_amount_,order_id_,order_no_,trans_no_,
+        status_,payment_channel_,mer_no_,sell_time_,create_time_,
         update_time,version_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SubjectChange">
@@ -64,25 +70,33 @@
     <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_subject_id_,original_course_fee_,
+        insert into subject_change
+        (student_id_,edu_teacher_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_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},#{originalSubjectId},#{originalCourseFee}, #{originalMusical},
+        values
+        (#{studentId},#{eduTeacherId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalSubjectId},#{originalCourseFee},
+        #{originalMusical},
         #{originalMusicalPrice},
-        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{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})
+        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sellTime},
+        #{createTime}, #{updateTime},#{version})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
         <!--@mbg.generated-->
         update subject_change
         <set>
+            <if test="eduTeacherId !=null ">
+                edu_teacher_id_ = #{eduTeacherId},
+            </if>
             <if test="studentId != null">
                 student_id_ = #{studentId},
             </if>
@@ -149,6 +163,12 @@
             <if test="status != null">
                 status_ = #{status},
             </if>
+            <if test="paymentChannel != null">
+                payment_channel_=#{paymentChannel},
+            </if>
+            <if test="merNo != null">
+                mer_no_ = #{merNo},
+            </if>
             <if test="sellTime != null">
                 sell_time_ = #{sellTime},
             </if>