增加分润财务订单

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentRouteOrderDto.java

@@ -7,11 +7,6 @@ import java.math.BigDecimal;
 public class StudentPaymentRouteOrderDto extends StudentPaymentOrder {
 
     /**
-     * 原始订单编号
-     */
-    private Long orderId;
-
-    /**
      * 分配分部id
      */
     private Integer routingOrganId;
@@ -31,14 +26,6 @@ public class StudentPaymentRouteOrderDto extends StudentPaymentOrder {
      */
     private String feeFlag;
 
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
     public Integer getRoutingOrganId() {
         return routingOrganId;
     }

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

@@ -31,10 +31,6 @@ public class StudentPaymentRouteOrder {
     */
     private String feeFlag;
 
-    private Date createTime;
-
-    private Date updateTime;
-
     public Long getId() {
         return id;
     }
@@ -75,22 +71,6 @@ public class StudentPaymentRouteOrder {
         this.feeFlag = feeFlag;
     }
 
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
     public String getOrderNo() {
         return orderNo;
     }

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

@@ -336,6 +336,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
 
         if (amount.compareTo(BigDecimal.ZERO) == 0) {
+
             Map<String, String> notifyMap = new HashMap<>();
             notifyMap.put("tradeState", "1");
             notifyMap.put("merOrderNo", studentPaymentOrder.getOrderNo());

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

@@ -10,8 +10,6 @@
         <result column="mer_no_" property="merNo"/>
         <result column="order_no_" property="orderNo"/>
         <result column="fee_flag_" property="feeFlag"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
     </resultMap>
 
     <resultMap id="StudentPaymentRouteOrderDto" type="com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto"
@@ -27,7 +25,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, routing_organ_id_, route_amount_, mer_no_, order_no_, fee_flag_, create_time_, update_time_
+        id_, routing_organ_id_, route_amount_, mer_no_, order_no_, fee_flag_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="StudentPaymentRouteOrder">
         <!--@mbg.generated-->
@@ -45,11 +43,9 @@
             parameterType="com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into student_payment_route_order (routing_organ_id_, route_amount_, mer_no_,
-        order_no_, fee_flag_, create_time_,
-        update_time_)
+        order_no_, fee_flag_)
         values (#{routingOrganId}, #{routeAmount}, #{merNo},
-        #{orderNo}, #{feeFlag}, #{createTime},
-        #{updateTime})
+        #{orderNo}, #{feeFlag})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder">
         <!--@mbg.generated-->
@@ -67,14 +63,8 @@
             <if test="orderNo != null">
                 order_no_ = #{orderNo},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
         </set>
-        where id_ = #{id,jdbcType=BIGINT}
+        where id_ = #{id}
     </update>
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"