Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+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;
@@ -12,6 +13,9 @@ public class SubjectChange {
     @ApiModelProperty(value="")
     private Integer id;
 
+    @ApiModelProperty(value="合作单位id")
+    private Integer cooperationOrganId;
+
     @ApiModelProperty(value="学生id")
     private Integer studentId;
 
@@ -29,6 +33,9 @@ public class SubjectChange {
     @ApiModelProperty(value="原始课程费用")
     private BigDecimal originalCourseFee;
 
+    @ApiModelProperty(value="乐器购买方式")
+    private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
+
     /**
     * 原始乐器编号
     */
@@ -105,12 +112,46 @@ public class SubjectChange {
     private BigDecimal courseMargin;
 
     /**
+     * 成本差额
+     */
+    @ApiModelProperty(value="成本差额")
+    private BigDecimal costMargin;
+
+
+    /**
+     * 销售金额（计入销售的金额）
+     */
+    private BigDecimal sellAmount;
+
+    /**
     * 状态
     */
     @ApiModelProperty(value="状态")
     private SubjectChangeStatusEnum status;
 
     /**
+     * 订单id
+     */
+    private Integer orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 订单流水号
+     */
+    private String transNo;
+
+    /**
+     * 销售时间
+     */
+    @ApiModelProperty(value="销售时间")
+    private Date sellTime;
+
+
+    /**
     * 创建时间
     */
     @ApiModelProperty(value="创建时间")
@@ -323,4 +364,68 @@ public class SubjectChange {
     public void setOrganId(Integer organId) {
         this.organId = organId;
     }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public BigDecimal getCostMargin() {
+        return costMargin;
+    }
+
+    public void setCostMargin(BigDecimal costMargin) {
+        this.costMargin = costMargin;
+    }
+
+    public BigDecimal getSellAmount() {
+        return sellAmount;
+    }
+
+    public void setSellAmount(BigDecimal sellAmount) {
+        this.sellAmount = sellAmount;
+    }
+
+    public Date getSellTime() {
+        return sellTime;
+    }
+
+    public void setSellTime(Date sellTime) {
+        this.sellTime = sellTime;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public KitGroupPurchaseTypeEnum getKitGroupPurchaseType() {
+        return kitGroupPurchaseType;
+    }
+
+    public void setKitGroupPurchaseType(KitGroupPurchaseTypeEnum kitGroupPurchaseType) {
+        this.kitGroupPurchaseType = kitGroupPurchaseType;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectChangeService.java

@@ -19,4 +19,11 @@ public interface SubjectChangeService extends BaseService<Integer, SubjectChange
      * @return
      */
     Map payChange(Integer id, BigDecimal amount, Boolean isUseBalancePayment) throws Exception;
+
+    /**
+     * 添加声部更换
+     * @param subjectChange
+     * @return
+     */
+    SubjectChange addChange(SubjectChange subjectChange);
 }

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

@@ -158,4 +158,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         studentPaymentOrderService.update(studentPaymentOrder);
         return payMap;
     }
+
+    @Override
+    public SubjectChange addChange(SubjectChange subjectChange) {
+        return null;
+    }
 }

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

@@ -8,12 +8,14 @@
         <result column="student_id_" property="studentId"/>
         <result column="studentName" property="studentName"/>
         <result column="organ_id_" property="organId"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="original_course_fee_" property="originalCourseFee"/>
         <result column="original_musical_" property="originalMusical"/>
         <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="change_course_fee_" property="changeCourseFee"/>
         <result column="change_musical_" property="changeMusical"/>
         <result column="change_musical_price_" property="changeMusicalPrice"/>
@@ -21,6 +23,11 @@
         <result column="change_accessories_price_" property="changeAccessoriesPrice"/>
         <result column="goods_margin_" property="goodsMargin"/>
         <result column="course_margin_" property="courseMargin"/>
+        <result column="cost_margin_" property="costMargin"/>
+        <result column="sell_amount_" property="sellAmount"/>
+        <result column="order_id_" property="orderId"/>
+        <result column="order_no_" property="orderNo"/>
+        <result column="trans_no_" property="transNo"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -28,11 +35,11 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_,student_id_,organ_id_, music_group_id_,original_course_fee_, original_musical_, original_musical_price_,
+        id_,student_id_,organ_id_,cooperation_organ_id_, music_group_id_,original_course_fee_, original_musical_, original_musical_price_,
         original_accessories_,
-        original_accessories_price_, change_course_fee_, change_musical_, change_musical_price_,
-        change_accessories_, change_accessories_price_, goods_margin_, course_margin_, status_,
-        create_time_, update_time,version_
+        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_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SubjectChange">
         <!--@mbg.generated-->
@@ -49,17 +56,15 @@
     <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_,music_group_id_,original_course_fee_, original_musical_,
-        original_musical_price_,
-        original_accessories_,
-        original_accessories_price_, change_course_fee_, change_musical_, change_musical_price_,
-        change_accessories_, change_accessories_price_, goods_margin_, course_margin_,
-        status_, create_time_, update_time,version_)
-        values (#{studentId},#{organId},#{musicGroupId},#{originalCourseFee}, #{originalMusical}, #{originalMusicalPrice},
-        #{originalAccessories},
-        #{originalAccessoriesPrice}, #{changeCourseFee}, #{changeMusical}, #{changeMusicalPrice},
-        #{changeAccessories}, #{changeAccessoriesPrice}, #{goodsMargin}, #{courseMargin},
-        #{status}, #{createTime}, #{updateTime},0)
+        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_,
+        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_)
+        values (#{studentId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalCourseFee}, #{originalMusical}, #{originalMusicalPrice},
+        #{originalAccessories}, #{originalAccessoriesPrice},#{kitGroupPurchaseType},#{changeCourseFee}, #{changeMusical},
+        #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice}, #{goodsMargin}, #{courseMargin},#{costMargin}
+        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status},#{sellTime}, #{createTime}, #{updateTime},0)
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
         <!--@mbg.generated-->
@@ -110,9 +115,24 @@
             <if test="courseMargin != null">
                 course_margin_ = #{courseMargin},
             </if>
+            <if test="costMargin != null">
+                cost_margin_ = #{costMargin},
+            </if>
+            <if test="orderId != null">
+                order_id_ = #{orderId},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo},
+            </if>
             <if test="status != null">
                 status_ = #{status},
             </if>
+            <if test="sellTime != null">
+                sell_time_ = #{sellTime},
+            </if>
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>