Просмотр исходного кода

订单中间表信息修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 6
Родитель
Сommit
b21c2eafc7

+ 63 - 76
src/main/java/com/goafanti/common/dao/TOrderMidMapper.java

@@ -2,97 +2,84 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.model.TOrderMidExample;
+
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TOrderMidMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    long countByExample(TOrderMidExample example);
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	long countByExample(TOrderMidExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int deleteByExample(TOrderMidExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int deleteByExample(TOrderMidExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int insert(TOrderMid record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int insert(TOrderMid record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int insertSelective(TOrderMid record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int insertSelective(TOrderMid record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    List<TOrderMid> selectByExample(TOrderMidExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	List<TOrderMid> selectByExample(TOrderMidExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    TOrderMid selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	TOrderMid selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int updateByExample(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int updateByExample(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int updateByPrimaryKeySelective(TOrderMid record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TOrderMid record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_mid
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    int updateByPrimaryKey(TOrderMid record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	int updateByPrimaryKey(TOrderMid record);
 
 	TOrderMid selectByOrderNo(String orderNo);
+
+	void updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
+
+	void updateFinanceId(@Param("id")String id, @Param("financeId")String financeId);
+
+	void updatefinalReceivables(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount, @Param("receivablesTime")Date receivablesTime);
 }

+ 41 - 29
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -14,7 +14,7 @@
     <result column="salesman_name" jdbcType="VARCHAR" property="salesmanName" />
     <result column="finance_name" jdbcType="VARCHAR" property="financeName" />
     <result column="final_receivables" jdbcType="DECIMAL" property="finalReceivables" />
-    <result column="finalReceivablesTime" jdbcType="TIMESTAMP" property="finalreceivablestime" />
+    <result column="final_Receivables_time" jdbcType="TIMESTAMP" property="finalReceivablesTime" />
     <result column="invoice_amount" jdbcType="DECIMAL" property="invoiceAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
@@ -22,7 +22,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,16 +90,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables, 
-    finalReceivablesTime, invoice_amount, create_time
+    final_Receivables_time, invoice_amount, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     select
     <if test="distinct">
@@ -118,7 +118,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -129,7 +129,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     delete from t_order_mid
     where id = #{id,jdbcType=INTEGER}
@@ -138,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     delete from t_order_mid
     <if test="_parameter != null">
@@ -149,22 +149,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     insert into t_order_mid (id, order_no, salesman_id, 
       finance_id, salesman_name, finance_name, 
-      final_receivables, finalReceivablesTime, 
+      final_receivables, final_Receivables_time, 
       invoice_amount, create_time)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, 
       #{financeId,jdbcType=VARCHAR}, #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, 
-      #{finalReceivables,jdbcType=DECIMAL}, #{finalreceivablestime,jdbcType=TIMESTAMP}, 
+      #{finalReceivables,jdbcType=DECIMAL}, #{finalReceivablesTime,jdbcType=TIMESTAMP}, 
       #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderMid">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     insert into t_order_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -189,8 +189,8 @@
       <if test="finalReceivables != null">
         final_receivables,
       </if>
-      <if test="finalreceivablestime != null">
-        finalReceivablesTime,
+      <if test="finalReceivablesTime != null">
+        final_Receivables_time,
       </if>
       <if test="invoiceAmount != null">
         invoice_amount,
@@ -221,8 +221,8 @@
       <if test="finalReceivables != null">
         #{finalReceivables,jdbcType=DECIMAL},
       </if>
-      <if test="finalreceivablestime != null">
-        #{finalreceivablestime,jdbcType=TIMESTAMP},
+      <if test="finalReceivablesTime != null">
+        #{finalReceivablesTime,jdbcType=TIMESTAMP},
       </if>
       <if test="invoiceAmount != null">
         #{invoiceAmount,jdbcType=DECIMAL},
@@ -236,7 +236,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     select count(*) from t_order_mid
     <if test="_parameter != null">
@@ -247,7 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     update t_order_mid
     <set>
@@ -272,8 +272,8 @@
       <if test="record.finalReceivables != null">
         final_receivables = #{record.finalReceivables,jdbcType=DECIMAL},
       </if>
-      <if test="record.finalreceivablestime != null">
-        finalReceivablesTime = #{record.finalreceivablestime,jdbcType=TIMESTAMP},
+      <if test="record.finalReceivablesTime != null">
+        final_Receivables_time = #{record.finalReceivablesTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.invoiceAmount != null">
         invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
@@ -290,7 +290,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     update t_order_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -300,7 +300,7 @@
       salesman_name = #{record.salesmanName,jdbcType=VARCHAR},
       finance_name = #{record.financeName,jdbcType=VARCHAR},
       final_receivables = #{record.finalReceivables,jdbcType=DECIMAL},
-      finalReceivablesTime = #{record.finalreceivablestime,jdbcType=TIMESTAMP},
+      final_Receivables_time = #{record.finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -311,7 +311,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     update t_order_mid
     <set>
@@ -333,8 +333,8 @@
       <if test="finalReceivables != null">
         final_receivables = #{finalReceivables,jdbcType=DECIMAL},
       </if>
-      <if test="finalreceivablestime != null">
-        finalReceivablesTime = #{finalreceivablestime,jdbcType=TIMESTAMP},
+      <if test="finalReceivablesTime != null">
+        final_Receivables_time = #{finalReceivablesTime,jdbcType=TIMESTAMP},
       </if>
       <if test="invoiceAmount != null">
         invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
@@ -349,7 +349,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Dec 06 16:24:51 CST 2019.
+      This element was generated on Mon Dec 09 14:31:25 CST 2019.
     -->
     update t_order_mid
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -358,7 +358,7 @@
       salesman_name = #{salesmanName,jdbcType=VARCHAR},
       finance_name = #{financeName,jdbcType=VARCHAR},
       final_receivables = #{finalReceivables,jdbcType=DECIMAL},
-      finalReceivablesTime = #{finalreceivablestime,jdbcType=TIMESTAMP},
+      final_Receivables_time = #{finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
@@ -369,4 +369,16 @@
     from t_order_mid
     where order_no = #{id,jdbcType=INTEGER}
   </select>
+  <update id="updateSalesmanId">
+  	update t_order_mid a ,admin b set a.salesman_id=#{transferId},a.salesman_name=b.name
+	where b.id=#{transferId} and a.salesman_id=#{aid}
+  </update>
+    <update id="updateFinanceId">
+  	update t_order_new a ,t_order_mid b,admin c  set b.finance_id=#{financeId},b.finance_name=c.name
+	where a.order_dep=#{id} and a.order_no=b.order_no and c.id= #{financeId}
+  </update>
+  <update id="updatefinalReceivables">
+  update t_order_mid set final_receivables= #{amount},`final_Receivables_time`= #{receivablesTime}
+	where order_no= #{orderNo}
+  </update>
 </mapper>

+ 4 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1143,9 +1143,8 @@ where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.ou
 		</if>
   </select>
   <select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
-  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
-  	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
-  	left join department d on o.order_dep = d.id left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
+  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id  
+left join department d on o.order_dep = d.id   	left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
 (select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
 	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no
   	 where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
@@ -1542,10 +1541,9 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>	
   
   <select id="countTotalAndActually" parameterType="Map" resultType="java.util.Map">
-  select sum(b.amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount from t_order_new o 
+	   select sum(o.settlement_amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount from t_order_new o 
   left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id 
-  left join ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
-    where delete_sign != 1  and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
+  where o.delete_sign != 1  and (o.approval = 0 or o.approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

+ 230 - 328
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -4,333 +4,235 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class TOrderMid {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.order_no
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private String orderNo;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.salesman_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private String salesmanId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.finance_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private String financeId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.salesman_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private String salesmanName;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.finance_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private String financeName;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.final_receivables
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private BigDecimal finalReceivables;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.finalReceivablesTime
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private Date finalreceivablestime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.invoice_amount
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private BigDecimal invoiceAmount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_mid.create_time
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.id
-     *
-     * @return the value of t_order_mid.id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.id
-     *
-     * @param id the value for t_order_mid.id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.order_no
-     *
-     * @return the value of t_order_mid.order_no
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.order_no
-     *
-     * @param orderNo the value for t_order_mid.order_no
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.salesman_id
-     *
-     * @return the value of t_order_mid.salesman_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public String getSalesmanId() {
-        return salesmanId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.salesman_id
-     *
-     * @param salesmanId the value for t_order_mid.salesman_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setSalesmanId(String salesmanId) {
-        this.salesmanId = salesmanId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.finance_id
-     *
-     * @return the value of t_order_mid.finance_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public String getFinanceId() {
-        return financeId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.finance_id
-     *
-     * @param financeId the value for t_order_mid.finance_id
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setFinanceId(String financeId) {
-        this.financeId = financeId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.salesman_name
-     *
-     * @return the value of t_order_mid.salesman_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public String getSalesmanName() {
-        return salesmanName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.salesman_name
-     *
-     * @param salesmanName the value for t_order_mid.salesman_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setSalesmanName(String salesmanName) {
-        this.salesmanName = salesmanName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.finance_name
-     *
-     * @return the value of t_order_mid.finance_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public String getFinanceName() {
-        return financeName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.finance_name
-     *
-     * @param financeName the value for t_order_mid.finance_name
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setFinanceName(String financeName) {
-        this.financeName = financeName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.final_receivables
-     *
-     * @return the value of t_order_mid.final_receivables
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public BigDecimal getFinalReceivables() {
-        return finalReceivables;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.final_receivables
-     *
-     * @param finalReceivables the value for t_order_mid.final_receivables
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setFinalReceivables(BigDecimal finalReceivables) {
-        this.finalReceivables = finalReceivables;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.finalReceivablesTime
-     *
-     * @return the value of t_order_mid.finalReceivablesTime
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public Date getFinalreceivablestime() {
-        return finalreceivablestime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.finalReceivablesTime
-     *
-     * @param finalreceivablestime the value for t_order_mid.finalReceivablesTime
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setFinalreceivablestime(Date finalreceivablestime) {
-        this.finalreceivablestime = finalreceivablestime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.invoice_amount
-     *
-     * @return the value of t_order_mid.invoice_amount
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public BigDecimal getInvoiceAmount() {
-        return invoiceAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.invoice_amount
-     *
-     * @param invoiceAmount the value for t_order_mid.invoice_amount
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setInvoiceAmount(BigDecimal invoiceAmount) {
-        this.invoiceAmount = invoiceAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_mid.create_time
-     *
-     * @return the value of t_order_mid.create_time
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_mid.create_time
-     *
-     * @param createTime the value for t_order_mid.create_time
-     *
-     * @mbg.generated Fri Dec 06 16:24:51 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_no
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private String salesmanId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private String financeId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private String salesmanName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private String financeName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_receivables
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private BigDecimal finalReceivables;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_Receivables_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private Date finalReceivablesTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.invoice_amount
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private BigDecimal invoiceAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.create_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	private Date createTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.id
+	 * @return  the value of t_order_mid.id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.id
+	 * @param id  the value for t_order_mid.id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_no
+	 * @return  the value of t_order_mid.order_no
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_no
+	 * @param orderNo  the value for t_order_mid.order_no
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_id
+	 * @return  the value of t_order_mid.salesman_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public String getSalesmanId() {
+		return salesmanId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_id
+	 * @param salesmanId  the value for t_order_mid.salesman_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setSalesmanId(String salesmanId) {
+		this.salesmanId = salesmanId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_id
+	 * @return  the value of t_order_mid.finance_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public String getFinanceId() {
+		return financeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_id
+	 * @param financeId  the value for t_order_mid.finance_id
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_name
+	 * @return  the value of t_order_mid.salesman_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_name
+	 * @param salesmanName  the value for t_order_mid.salesman_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_name
+	 * @return  the value of t_order_mid.finance_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public String getFinanceName() {
+		return financeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_name
+	 * @param financeName  the value for t_order_mid.finance_name
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_receivables
+	 * @return  the value of t_order_mid.final_receivables
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public BigDecimal getFinalReceivables() {
+		return finalReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_receivables
+	 * @param finalReceivables  the value for t_order_mid.final_receivables
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setFinalReceivables(BigDecimal finalReceivables) {
+		this.finalReceivables = finalReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_Receivables_time
+	 * @return  the value of t_order_mid.final_Receivables_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public Date getFinalReceivablesTime() {
+		return finalReceivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_Receivables_time
+	 * @param finalReceivablesTime  the value for t_order_mid.final_Receivables_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setFinalReceivablesTime(Date finalReceivablesTime) {
+		this.finalReceivablesTime = finalReceivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.invoice_amount
+	 * @return  the value of t_order_mid.invoice_amount
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.invoice_amount
+	 * @param invoiceAmount  the value for t_order_mid.invoice_amount
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.create_time
+	 * @return  the value of t_order_mid.create_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.create_time
+	 * @param createTime  the value for t_order_mid.create_time
+	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 892 - 933
src/main/java/com/goafanti/common/model/TOrderMidExample.java


+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -40,6 +40,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
+import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TemporaryReceivablesMapper;
@@ -92,6 +93,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	private TOrderLogMapper	tOrderLogMapper;
 	@Autowired
 	private TOrderTaskMapper tOrderTaskMapper;
+	@Autowired
+	private TOrderMidMapper	tOrderMidMapper;
 	
 	@Resource
 	private FundManageOrderService fundManageOrderService;
@@ -236,11 +239,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 			}
 			//否则新增流水信息
+			Date date=new Date();
 			tbn.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
 			tbn.setCreater(TokenManager.getAdminId());
 			tbn.setType(1);//批量
 			tbn.setOrderNo(t.getOrderNo());
-			tbn.setCreateTime(new Date());
+			tbn.setCreateTime(date);
 			tbn.setPayeeId("0");//默认设置0
 			tbn.setPayerId(t.getBuyerId());
 			tbn.setTransactionSubject(0);
@@ -251,6 +255,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			tbn.setFinancialPayTime(tr.getReceivablesTime());
 			tbn.setFinancialPayNo(tr.getFinancialPayNo());
 			tbn.setRemarks(tr.getRemarks());
+			tOrderMidMapper.updatefinalReceivables(t.getOrderNo(),tr.getAmount(),date);
 			//修改订单结算金额和结算状态
 			//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
 			TOrderNew orderNew = new TOrderNew();

+ 4 - 0
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -22,6 +23,8 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManagementMapper> implements OrganizationService {
 	@Autowired
 	private OrganizationManagementMapper organizationManagementMapper;
+	@Autowired
+	private TOrderMidMapper	tOrderMidMapper;
 	@Override
 	public Pagination<OrganizationListOut> listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
 			Integer pageSize) {
@@ -110,6 +113,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setId(id);
 		om.setAbbreviation(abbreviation);
 		om.setFinanceId(financeId);
+		tOrderMidMapper.updateFinanceId(id,financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;

+ 5 - 1
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -20,6 +20,7 @@ import com.goafanti.common.dao.PatentNewMapper;
 import com.goafanti.common.dao.RoleMapper;
 import com.goafanti.common.dao.RolePermissionMapper;
 import com.goafanti.common.dao.RoleResourcesMapper;
+import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
@@ -31,6 +32,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Role;
 import com.goafanti.common.model.RolePermission;
 import com.goafanti.common.model.RoleResources;
+import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.model.UserRole;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -65,6 +67,8 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	TOrderNewMapper	tOrderNewMapper;
 	@Autowired
 	TTaskLogMapper	tTaskLogMapper;
+	@Autowired
+	TOrderMidMapper	tOrderMidMapper;
 	@Override
 	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -193,7 +197,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 			throw new BusinessException(new Error("","用户角色资源不存在"));
 		}
 		for (Integer s : list) {
-			System.out.println(s);
 			if (s==roleResources.YXKH.getCode()) {
 				roleResourcesMapper.updateLockRelease("0",aid,transferId);//将用户锁转给指定人
 				userBusinessMapper.updateDimissionTransfer(aid,transferId);
@@ -202,6 +205,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 			}
 			if (s==roleResources.QDYW.getCode()) {
 				tOrderNewMapper.updateSalesmanId(aid, transferId);
+				tOrderMidMapper.updateSalesmanId(aid, transferId);
 				patentNewMapper.updateAdmin(aid,transferId);
 				roleResourcesMapper.updateLockRelease("1",aid,transferId);//将业务锁转给指定人
 			}