Forráskód Böngészése

订单中间开发

Signed-off-by: anderx <312518615@qq.com>
anderx 5 éve%!(EXTRA string=óta)
szülő
commit
607ceca859

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="user_transfer_log"/>
+    <table schema="aft" tableName="t_order_mid"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

+ 13 - 11
src/main/java/com/goafanti/common/dao/TOrderMidMapper.java

@@ -11,67 +11,67 @@ 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	long countByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int deleteByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int insert(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int insertSelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	List<TOrderMid> selectByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	TOrderMid selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderMid record);
 
@@ -84,4 +84,6 @@ public interface TOrderMidMapper {
 	void updatefinalReceivables(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount, @Param("receivablesTime")Date receivablesTime);
 
 	void updateInvoice(String orderNo);
+
+	void addOrderReceivables(@Param("orderNo")String orderNo, @Param("money")BigDecimal money);
 }

+ 60 - 23
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 Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -18,12 +18,14 @@
     <result column="invoice_amount" jdbcType="DECIMAL" property="invoiceAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
+    <result column="order_receivables" jdbcType="DECIMAL" property="orderReceivables" />
+    <result column="order_arrears" jdbcType="DECIMAL" property="orderArrears" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +93,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables, 
-    final_Receivables_time, invoice_amount, create_time, buyer_name
+    final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables, 
+    order_arrears
   </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 Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     select
     <if test="distinct">
@@ -119,7 +122,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     delete from t_order_mid
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     delete from t_order_mid
     <if test="_parameter != null">
@@ -150,24 +153,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     insert into t_order_mid (id, order_no, salesman_id, 
       finance_id, salesman_name, finance_name, 
       final_receivables, final_Receivables_time, 
-      invoice_amount, create_time, buyer_name
-      )
+      invoice_amount, create_time, buyer_name, 
+      order_receivables, order_arrears)
     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}, 
-      #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{buyerName,jdbcType=VARCHAR}
-      )
+      #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{buyerName,jdbcType=VARCHAR}, 
+      #{orderReceivables,jdbcType=DECIMAL}, #{orderArrears,jdbcType=DECIMAL})
   </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 Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     insert into t_order_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -204,6 +207,12 @@
       <if test="buyerName != null">
         buyer_name,
       </if>
+      <if test="orderReceivables != null">
+        order_receivables,
+      </if>
+      <if test="orderArrears != null">
+        order_arrears,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -239,13 +248,19 @@
       <if test="buyerName != null">
         #{buyerName,jdbcType=VARCHAR},
       </if>
+      <if test="orderReceivables != null">
+        #{orderReceivables,jdbcType=DECIMAL},
+      </if>
+      <if test="orderArrears != null">
+        #{orderArrears,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     select count(*) from t_order_mid
     <if test="_parameter != null">
@@ -256,7 +271,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -293,6 +308,12 @@
       <if test="record.buyerName != null">
         buyer_name = #{record.buyerName,jdbcType=VARCHAR},
       </if>
+      <if test="record.orderReceivables != null">
+        order_receivables = #{record.orderReceivables,jdbcType=DECIMAL},
+      </if>
+      <if test="record.orderArrears != null">
+        order_arrears = #{record.orderArrears,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -302,7 +323,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     update t_order_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -315,7 +336,9 @@
       final_Receivables_time = #{record.finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      buyer_name = #{record.buyerName,jdbcType=VARCHAR}
+      buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+      order_receivables = #{record.orderReceivables,jdbcType=DECIMAL},
+      order_arrears = #{record.orderArrears,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -324,7 +347,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -358,6 +381,12 @@
       <if test="buyerName != null">
         buyer_name = #{buyerName,jdbcType=VARCHAR},
       </if>
+      <if test="orderReceivables != null">
+        order_receivables = #{orderReceivables,jdbcType=DECIMAL},
+      </if>
+      <if test="orderArrears != null">
+        order_arrears = #{orderArrears,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -365,7 +394,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Mar 18 15:17:11 CST 2020.
+      This element was generated on Fri Apr 10 15:06:35 CST 2020.
     -->
     update t_order_mid
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -377,7 +406,9 @@
       final_Receivables_time = #{finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      buyer_name = #{buyerName,jdbcType=VARCHAR}
+      buyer_name = #{buyerName,jdbcType=VARCHAR},
+      order_receivables = #{orderReceivables,jdbcType=DECIMAL},
+      order_arrears = #{orderArrears,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByOrderNo" resultMap="BaseResultMap">
@@ -395,11 +426,17 @@
 	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}
+  update t_order_mid set final_receivables= #{amount},`final_Receivables_time`= #{receivablesTime},
+  order_arrears=if(order_arrears- #{amount} &lt; 0,0,order_arrears)
 	where order_no= #{orderNo}
   </update>
   <update id="updateInvoice">
   update t_order_mid m,(select order_no,sum(amount)amount from t_order_invoice where status=2 group by order_no)b 
 	set m.invoice_amount=b.amount where m.order_no= #{orderNo} and  m.order_no=b.order_no 
   </update>
+  <update id="addOrderReceivables"> 
+  update t_order_mid  set order_receivables=order_receivables+#{money},
+  order_arrears=order_arrears+#{money}
+	where order_no=#{orderNo}
+  </update>
 </mapper>

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

@@ -1116,15 +1116,14 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-   select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
+ select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
 	o.process_status as processStatus, o.settlement_amount as actuallyTotalAmount, o.contract_no as contractNo, o.approval, o.back_status backStatus,
 	a.salesman_name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
 	o.first_amount as signFirstPayment, o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,
-	too.company_name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,
-	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.invoice_amount invoiceAmount 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 t_order_mid a on o.order_no=a.order_no 
-left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and approval !=3 
-	and outsource=  #{o.outsource,jdbcType=INTEGER}	
+	too.company_name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,a.invoice_amount invoiceAmount ,
+	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.order_receivables orderReceivables,a.order_arrears orderArrears
+	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 t_order_mid a on o.order_no=a.order_no 
+	left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and approval !=3 and outsource=  #{o.outsource,jdbcType=INTEGER}	
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

+ 79 - 33
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -7,64 +7,74 @@ public class TOrderMid {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_no
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_id
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_id
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_name
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String salesmanName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_name
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String financeName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_receivables
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private Date finalReceivablesTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.invoice_amount
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.create_time
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.buyer_name
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	private String buyerName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_receivables
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	private BigDecimal orderReceivables;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_arrears
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	private BigDecimal orderArrears;
 
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -73,7 +83,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -82,7 +92,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -91,7 +101,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -100,7 +110,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -109,7 +119,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -118,7 +128,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -127,7 +137,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -136,7 +146,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getSalesmanName() {
 		return salesmanName;
@@ -145,7 +155,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setSalesmanName(String salesmanName) {
 		this.salesmanName = salesmanName;
@@ -154,7 +164,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getFinanceName() {
 		return financeName;
@@ -163,7 +173,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setFinanceName(String financeName) {
 		this.financeName = financeName;
@@ -172,7 +182,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
@@ -181,7 +191,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setFinalReceivables(BigDecimal finalReceivables) {
 		this.finalReceivables = finalReceivables;
@@ -190,7 +200,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public Date getFinalReceivablesTime() {
 		return finalReceivablesTime;
@@ -199,7 +209,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setFinalReceivablesTime(Date finalReceivablesTime) {
 		this.finalReceivablesTime = finalReceivablesTime;
@@ -208,7 +218,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -217,7 +227,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -226,7 +236,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -235,7 +245,7 @@ public class TOrderMid {
 	/**
 	 * 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  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -244,7 +254,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.buyer_name
 	 * @return  the value of t_order_mid.buyer_name
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getBuyerName() {
 		return buyerName;
@@ -253,9 +263,45 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.buyer_name
 	 * @param buyerName  the value for t_order_mid.buyer_name
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setBuyerName(String buyerName) {
 		this.buyerName = buyerName;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_receivables
+	 * @return  the value of t_order_mid.order_receivables
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	public BigDecimal getOrderReceivables() {
+		return orderReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_receivables
+	 * @param orderReceivables  the value for t_order_mid.order_receivables
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	public void setOrderReceivables(BigDecimal orderReceivables) {
+		this.orderReceivables = orderReceivables;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_arrears
+	 * @return  the value of t_order_mid.order_arrears
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	public BigDecimal getOrderArrears() {
+		return orderArrears;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_arrears
+	 * @param orderArrears  the value for t_order_mid.order_arrears
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
+	 */
+	public void setOrderArrears(BigDecimal orderArrears) {
+		this.orderArrears = orderArrears;
+	}
 }

+ 136 - 16
src/main/java/com/goafanti/common/model/TOrderMidExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderMidExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public TOrderMidExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -883,11 +883,131 @@ public class TOrderMidExample {
 			addCriterion("buyer_name not between", value1, value2, "buyerName");
 			return (Criteria) this;
 		}
+
+		public Criteria andOrderReceivablesIsNull() {
+			addCriterion("order_receivables is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesIsNotNull() {
+			addCriterion("order_receivables is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesEqualTo(BigDecimal value) {
+			addCriterion("order_receivables =", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesNotEqualTo(BigDecimal value) {
+			addCriterion("order_receivables <>", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesGreaterThan(BigDecimal value) {
+			addCriterion("order_receivables >", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_receivables >=", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesLessThan(BigDecimal value) {
+			addCriterion("order_receivables <", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_receivables <=", value, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesIn(List<BigDecimal> values) {
+			addCriterion("order_receivables in", values, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesNotIn(List<BigDecimal> values) {
+			addCriterion("order_receivables not in", values, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_receivables between", value1, value2, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderReceivablesNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_receivables not between", value1, value2, "orderReceivables");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsIsNull() {
+			addCriterion("order_arrears is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsIsNotNull() {
+			addCriterion("order_arrears is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsEqualTo(BigDecimal value) {
+			addCriterion("order_arrears =", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsNotEqualTo(BigDecimal value) {
+			addCriterion("order_arrears <>", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsGreaterThan(BigDecimal value) {
+			addCriterion("order_arrears >", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_arrears >=", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsLessThan(BigDecimal value) {
+			addCriterion("order_arrears <", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_arrears <=", value, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsIn(List<BigDecimal> values) {
+			addCriterion("order_arrears in", values, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsNotIn(List<BigDecimal> values) {
+			addCriterion("order_arrears not in", values, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_arrears between", value1, value2, "orderArrears");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderArrearsNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_arrears not between", value1, value2, "orderArrears");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 * @mbg.generated  Fri Apr 10 15:06:35 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 16 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -92,6 +92,10 @@ public class OrderListBo {
 	private Integer amountStatus;
 	/** 驳回位置*/
 	private Integer backStatus;
+	/**应收款 */
+	private String orderReceivables;
+	/**欠款 */
+	private String  orderArrears;
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -354,4 +358,16 @@ public class OrderListBo {
 	public void setBackStatus(Integer backStatus) {
 		this.backStatus = backStatus;
 	}
+	public String getOrderReceivables() {
+		return orderReceivables;
+	}
+	public void setOrderReceivables(String orderReceivables) {
+		this.orderReceivables = orderReceivables;
+	}
+	public String getOrderArrears() {
+		return orderArrears;
+	}
+	public void setOrderArrears(String orderArrears) {
+		this.orderArrears = orderArrears;
+	}
 }

+ 0 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -163,8 +163,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			 fids.add(TokenManager.getAdminId());
 			params.put("fids",fids);
 		}
-		
-		
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);

+ 21 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -533,6 +533,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ocl.setRemarks(startRemarks==null?"":startRemarks);
 			ocl.setChangeId(noc.getId());
 			ocl.setStatus(0);
+			chekeAmout(t);
 			orderChangeLogMapper.insertSelective(ocl);
 			TOrderNew ton=new TOrderNew();
 			ton.setOrderNo(noc.getOrderNo());
@@ -547,6 +548,26 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return 1; 
 	}
 	
+	private void chekeAmout(NewOrderChangeBo t) {
+		BigDecimal amout=t.getTotalAmount();
+		List<TChangeTaskOut> list = selectChangeTask(t.getId());
+		BigDecimal count=new BigDecimal(0);
+		for (TChangeTaskOut tt : list) {
+			count=count.add(tt.getCommodityPrice());
+		}
+		if (amout.compareTo(count)!=0) {
+			throw new BusinessException("项目金额总和不等于合同总金额。");
+		}
+		List<TChangeDunOut> list2 = selectChangeDun(t.getId());
+		count=new BigDecimal(0);
+		for (TChangeDunOut td : list2) {
+			count=count.add(td.getMoney());
+		}
+		if (amout.compareTo(count)!=0) {
+			throw new BusinessException("收款节点金额总和不等于合同总金额。");
+		}
+	}
+
 	/**
 	   *   判断变更项目是否拆分父子数量是否一直
 	 * @param noc

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

@@ -285,7 +285,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tl.setProcess(OrderLogProcess.TJ.getCode());
 			tl.setAid(TokenManager.getAdminId());
 			addOrderLog(tl,null);
-			System.out.println(""+t2.getContractNo());
 			if (StringUtils.isBlank(t2.getContractNo())) {
 				//没有合同编号则生成
 				createContractNo(t);
@@ -597,6 +596,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					o.setStatus(1);
 					o.setStartTime(new Date());
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
+					tOrderMidMapper.addOrderReceivables(o.getOrderNo(),o.getMoney());
 					addNewDunNoticAndSendEmail(t2,o);
 				}
 			}

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

@@ -229,7 +229,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					
 					addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
 				}
-			
+				
 			}
 			if(tr.getStatus()==2) {
 				tr.setStatus(0);