anderx лет назад: 6
Родитель
Сommit
8d20c87005

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="order_refund_invoice"/>
+    <table schema="aft" tableName="new_order_change"/>
   </context>
 </generatorConfiguration>

+ 16 - 11
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderChangeExample;
 import com.goafanti.order.bo.NewOrderChangeBo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,68 +12,68 @@ public interface NewOrderChangeMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	long countByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int deleteByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int insert(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int insertSelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	NewOrderChange selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderChange record,
 			@Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int updateByExample(@Param("record") NewOrderChange record, @Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int updateByPrimaryKeySelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 
@@ -81,4 +82,8 @@ public interface NewOrderChangeMapper {
 	int checkOderNo(String orderNo);
 
 	NewOrderChangeBo selectById(Integer id);
+
+	void addRefundInvoice(@Param("orderNo")String orderNo, @Param("amount")BigDecimal amount);
+
+	void subtractRefundInvoice(@Param("orderNo")String orderNo,@Param("amount")BigDecimal amount);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -102,4 +102,6 @@ public interface TOrderTaskMapper {
 	List<TOrderTask> getReceiverByOid(String oid);
 
 	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId);
+
+	String selectEstimateCost(String orderNo);
 }

+ 78 - 21
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -31,12 +31,15 @@
     <result column="cw_cost" jdbcType="DECIMAL" property="cwCost" />
     <result column="refundable_amount" jdbcType="DECIMAL" property="refundableAmount" />
     <result column="cw_remarks" jdbcType="VARCHAR" property="cwRemarks" />
+    <result column="estimate_cost" jdbcType="DECIMAL" property="estimateCost" />
+    <result column="estimate_refundable" jdbcType="DECIMAL" property="estimateRefundable" />
+    <result column="refund_Invoice" jdbcType="DECIMAL" property="refundInvoice" />
   </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 Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -70,7 +73,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -104,18 +107,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     id, order_no, process_state, status, type, create_time, remarks, voucher_url, total_amount, 
     settlement_amount, change_amount, applicant, dep_name, project_state, zxs_cost, zxs_remarks, 
     payment_time, payment_amount, invoice_time, invoice_amount, invoice_type, cw_cost, 
-    refundable_amount, cw_remarks
+    refundable_amount, cw_remarks, estimate_cost, estimate_refundable, refund_Invoice
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     select
     <if test="distinct">
@@ -134,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -145,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     delete from new_order_change
     where id = #{id,jdbcType=INTEGER}
@@ -154,7 +157,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     delete from new_order_change
     <if test="_parameter != null">
@@ -165,7 +168,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     insert into new_order_change (id, order_no, process_state, 
       status, type, create_time, 
@@ -174,7 +177,8 @@
       dep_name, project_state, zxs_cost, 
       zxs_remarks, payment_time, payment_amount, 
       invoice_time, invoice_amount, invoice_type, 
-      cw_cost, refundable_amount, cw_remarks
+      cw_cost, refundable_amount, cw_remarks, 
+      estimate_cost, estimate_refundable, refund_Invoice
       )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, 
       #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
@@ -183,14 +187,15 @@
       #{depName,jdbcType=VARCHAR}, #{projectState,jdbcType=VARCHAR}, #{zxsCost,jdbcType=DECIMAL}, 
       #{zxsRemarks,jdbcType=VARCHAR}, #{paymentTime,jdbcType=TIMESTAMP}, #{paymentAmount,jdbcType=DECIMAL}, 
       #{invoiceTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, 
-      #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}
+      #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, 
+      #{estimateCost,jdbcType=DECIMAL}, #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderChange">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     insert into new_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -266,6 +271,15 @@
       <if test="cwRemarks != null">
         cw_remarks,
       </if>
+      <if test="estimateCost != null">
+        estimate_cost,
+      </if>
+      <if test="estimateRefundable != null">
+        estimate_refundable,
+      </if>
+      <if test="refundInvoice != null">
+        refund_Invoice,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -340,13 +354,22 @@
       <if test="cwRemarks != null">
         #{cwRemarks,jdbcType=VARCHAR},
       </if>
+      <if test="estimateCost != null">
+        #{estimateCost,jdbcType=DECIMAL},
+      </if>
+      <if test="estimateRefundable != null">
+        #{estimateRefundable,jdbcType=DECIMAL},
+      </if>
+      <if test="refundInvoice != null">
+        #{refundInvoice,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     select count(*) from new_order_change
     <if test="_parameter != null">
@@ -357,7 +380,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     update new_order_change
     <set>
@@ -433,6 +456,15 @@
       <if test="record.cwRemarks != null">
         cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR},
       </if>
+      <if test="record.estimateCost != null">
+        estimate_cost = #{record.estimateCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.estimateRefundable != null">
+        estimate_refundable = #{record.estimateRefundable,jdbcType=DECIMAL},
+      </if>
+      <if test="record.refundInvoice != null">
+        refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -442,7 +474,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     update new_order_change
     set id = #{record.id,jdbcType=INTEGER},
@@ -468,7 +500,10 @@
       invoice_type = #{record.invoiceType,jdbcType=VARCHAR},
       cw_cost = #{record.cwCost,jdbcType=DECIMAL},
       refundable_amount = #{record.refundableAmount,jdbcType=DECIMAL},
-      cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR}
+      cw_remarks = #{record.cwRemarks,jdbcType=VARCHAR},
+      estimate_cost = #{record.estimateCost,jdbcType=DECIMAL},
+      estimate_refundable = #{record.estimateRefundable,jdbcType=DECIMAL},
+      refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -477,7 +512,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     update new_order_change
     <set>
@@ -550,6 +585,15 @@
       <if test="cwRemarks != null">
         cw_remarks = #{cwRemarks,jdbcType=VARCHAR},
       </if>
+      <if test="estimateCost != null">
+        estimate_cost = #{estimateCost,jdbcType=DECIMAL},
+      </if>
+      <if test="estimateRefundable != null">
+        estimate_refundable = #{estimateRefundable,jdbcType=DECIMAL},
+      </if>
+      <if test="refundInvoice != null">
+        refund_Invoice = #{refundInvoice,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -557,7 +601,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 22 09:48:19 CST 2019.
+      This element was generated on Wed Sep 18 14:33:46 CST 2019.
     -->
     update new_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -582,7 +626,10 @@
       invoice_type = #{invoiceType,jdbcType=VARCHAR},
       cw_cost = #{cwCost,jdbcType=DECIMAL},
       refundable_amount = #{refundableAmount,jdbcType=DECIMAL},
-      cw_remarks = #{cwRemarks,jdbcType=VARCHAR}
+      cw_remarks = #{cwRemarks,jdbcType=VARCHAR},
+      estimate_cost = #{estimateCost,jdbcType=DECIMAL},
+      estimate_refundable = #{estimateRefundable,jdbcType=DECIMAL},
+      refund_Invoice = #{refundInvoice,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -655,7 +702,7 @@ select
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	<if test="complete ==0 and processState != 8">
-	 and a.process_state &gt;= #{processState}
+	 and a.process_state &gt; = #{processState}
 	</if>
 	<if test="complete ==0 and processState == 8">
 	 and a.process_state &gt;= #{processState} and  a.process_state &lt; 9
@@ -759,4 +806,14 @@ select
 	 and a.process_state = 8  and  a.status = 4
 	</if>
 	</select>
+	<update id="addRefundInvoice" >
+	update  new_order_change
+	set `refund_Invoice`=`refund_Invoice`+ #{amount}
+	where order_no= #{orderNo}
+	</update>
+	<update id="subtractRefundInvoice">
+	update  new_order_change
+	set `refund_Invoice`=`refund_Invoice`- #{amount}
+	where order_no= #{orderNo}
+	</update>
 </mapper>

+ 5 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1114,5 +1114,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     update t_order_task set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR}
 	where task_receiver=#{aid,jdbcType=VARCHAR}
   </update>
-  
+  <select id="selectEstimateCost" resultType="java.lang.String">
+  	select sum(a.commodity_quantity * ifnull(b.price,0))   from t_order_task a
+	left join business_project b on a.commodity_id=b.id
+	where order_no= #{orderNo}
+  </select>
 </mapper>

+ 141 - 72
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,129 +7,144 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Integer processState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String voucherUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal changeAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String depName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String projectState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal zxsCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String zxsRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Date paymentTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private Date invoiceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String invoiceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal cwCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private BigDecimal refundableAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	private String cwRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_cost
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	private BigDecimal estimateCost;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_refundable
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	private BigDecimal estimateRefundable;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_Invoice
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	private BigDecimal refundInvoice;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.id
 	 * @return  the value of new_order_change.id
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -138,7 +153,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.id
 	 * @param id  the value for new_order_change.id
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -147,7 +162,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.order_no
 	 * @return  the value of new_order_change.order_no
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -156,7 +171,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.order_no
 	 * @param orderNo  the value for new_order_change.order_no
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -165,7 +180,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.process_state
 	 * @return  the value of new_order_change.process_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -174,7 +189,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.process_state
 	 * @param processState  the value for new_order_change.process_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -183,7 +198,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.status
 	 * @return  the value of new_order_change.status
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -192,7 +207,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.status
 	 * @param status  the value for new_order_change.status
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -201,7 +216,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.type
 	 * @return  the value of new_order_change.type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Integer getType() {
 		return type;
@@ -210,7 +225,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.type
 	 * @param type  the value for new_order_change.type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -219,7 +234,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.create_time
 	 * @return  the value of new_order_change.create_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -228,7 +243,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.create_time
 	 * @param createTime  the value for new_order_change.create_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -237,7 +252,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.remarks
 	 * @return  the value of new_order_change.remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -246,7 +261,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.remarks
 	 * @param remarks  the value for new_order_change.remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -255,7 +270,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.voucher_url
 	 * @return  the value of new_order_change.voucher_url
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -264,7 +279,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.voucher_url
 	 * @param voucherUrl  the value for new_order_change.voucher_url
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -273,7 +288,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.total_amount
 	 * @return  the value of new_order_change.total_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -282,7 +297,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.total_amount
 	 * @param totalAmount  the value for new_order_change.total_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -291,7 +306,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.settlement_amount
 	 * @return  the value of new_order_change.settlement_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -300,7 +315,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.settlement_amount
 	 * @param settlementAmount  the value for new_order_change.settlement_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -309,7 +324,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.change_amount
 	 * @return  the value of new_order_change.change_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -318,7 +333,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.change_amount
 	 * @param changeAmount  the value for new_order_change.change_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -327,7 +342,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.applicant
 	 * @return  the value of new_order_change.applicant
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -336,7 +351,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.applicant
 	 * @param applicant  the value for new_order_change.applicant
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -345,7 +360,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.dep_name
 	 * @return  the value of new_order_change.dep_name
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getDepName() {
 		return depName;
@@ -354,7 +369,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.dep_name
 	 * @param depName  the value for new_order_change.dep_name
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
@@ -363,7 +378,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.project_state
 	 * @return  the value of new_order_change.project_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getProjectState() {
 		return projectState;
@@ -372,7 +387,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.project_state
 	 * @param projectState  the value for new_order_change.project_state
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setProjectState(String projectState) {
 		this.projectState = projectState;
@@ -381,7 +396,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_cost
 	 * @return  the value of new_order_change.zxs_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getZxsCost() {
 		return zxsCost;
@@ -390,7 +405,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_cost
 	 * @param zxsCost  the value for new_order_change.zxs_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setZxsCost(BigDecimal zxsCost) {
 		this.zxsCost = zxsCost;
@@ -399,7 +414,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_remarks
 	 * @return  the value of new_order_change.zxs_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getZxsRemarks() {
 		return zxsRemarks;
@@ -408,7 +423,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_remarks
 	 * @param zxsRemarks  the value for new_order_change.zxs_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setZxsRemarks(String zxsRemarks) {
 		this.zxsRemarks = zxsRemarks;
@@ -417,7 +432,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_time
 	 * @return  the value of new_order_change.payment_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Date getPaymentTime() {
 		return paymentTime;
@@ -426,7 +441,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_time
 	 * @param paymentTime  the value for new_order_change.payment_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setPaymentTime(Date paymentTime) {
 		this.paymentTime = paymentTime;
@@ -435,7 +450,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_amount
 	 * @return  the value of new_order_change.payment_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -444,7 +459,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_amount
 	 * @param paymentAmount  the value for new_order_change.payment_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -453,7 +468,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_time
 	 * @return  the value of new_order_change.invoice_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Date getInvoiceTime() {
 		return invoiceTime;
@@ -462,7 +477,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_time
 	 * @param invoiceTime  the value for new_order_change.invoice_time
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setInvoiceTime(Date invoiceTime) {
 		this.invoiceTime = invoiceTime;
@@ -471,7 +486,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_amount
 	 * @return  the value of new_order_change.invoice_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -480,7 +495,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_amount
 	 * @param invoiceAmount  the value for new_order_change.invoice_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -489,7 +504,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_type
 	 * @return  the value of new_order_change.invoice_type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getInvoiceType() {
 		return invoiceType;
@@ -498,7 +513,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_type
 	 * @param invoiceType  the value for new_order_change.invoice_type
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
@@ -507,7 +522,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_cost
 	 * @return  the value of new_order_change.cw_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getCwCost() {
 		return cwCost;
@@ -516,7 +531,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_cost
 	 * @param cwCost  the value for new_order_change.cw_cost
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setCwCost(BigDecimal cwCost) {
 		this.cwCost = cwCost;
@@ -525,7 +540,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refundable_amount
 	 * @return  the value of new_order_change.refundable_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public BigDecimal getRefundableAmount() {
 		return refundableAmount;
@@ -534,7 +549,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refundable_amount
 	 * @param refundableAmount  the value for new_order_change.refundable_amount
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setRefundableAmount(BigDecimal refundableAmount) {
 		this.refundableAmount = refundableAmount;
@@ -543,7 +558,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_remarks
 	 * @return  the value of new_order_change.cw_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getCwRemarks() {
 		return cwRemarks;
@@ -552,9 +567,63 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_remarks
 	 * @param cwRemarks  the value for new_order_change.cw_remarks
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setCwRemarks(String cwRemarks) {
 		this.cwRemarks = cwRemarks;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_cost
+	 * @return  the value of new_order_change.estimate_cost
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public BigDecimal getEstimateCost() {
+		return estimateCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_cost
+	 * @param estimateCost  the value for new_order_change.estimate_cost
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public void setEstimateCost(BigDecimal estimateCost) {
+		this.estimateCost = estimateCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_refundable
+	 * @return  the value of new_order_change.estimate_refundable
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public BigDecimal getEstimateRefundable() {
+		return estimateRefundable;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_refundable
+	 * @param estimateRefundable  the value for new_order_change.estimate_refundable
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public void setEstimateRefundable(BigDecimal estimateRefundable) {
+		this.estimateRefundable = estimateRefundable;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_Invoice
+	 * @return  the value of new_order_change.refund_Invoice
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public BigDecimal getRefundInvoice() {
+		return refundInvoice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_Invoice
+	 * @param refundInvoice  the value for new_order_change.refund_Invoice
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
+	 */
+	public void setRefundInvoice(BigDecimal refundInvoice) {
+		this.refundInvoice = refundInvoice;
+	}
 }

+ 196 - 16
src/main/java/com/goafanti/common/model/NewOrderChangeExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class NewOrderChangeExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public NewOrderChangeExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1693,11 +1693,191 @@ public class NewOrderChangeExample {
 			addCriterion("cw_remarks not between", value1, value2, "cwRemarks");
 			return (Criteria) this;
 		}
+
+		public Criteria andEstimateCostIsNull() {
+			addCriterion("estimate_cost is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostIsNotNull() {
+			addCriterion("estimate_cost is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostEqualTo(BigDecimal value) {
+			addCriterion("estimate_cost =", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostNotEqualTo(BigDecimal value) {
+			addCriterion("estimate_cost <>", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostGreaterThan(BigDecimal value) {
+			addCriterion("estimate_cost >", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("estimate_cost >=", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostLessThan(BigDecimal value) {
+			addCriterion("estimate_cost <", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("estimate_cost <=", value, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostIn(List<BigDecimal> values) {
+			addCriterion("estimate_cost in", values, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostNotIn(List<BigDecimal> values) {
+			addCriterion("estimate_cost not in", values, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("estimate_cost between", value1, value2, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateCostNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("estimate_cost not between", value1, value2, "estimateCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableIsNull() {
+			addCriterion("estimate_refundable is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableIsNotNull() {
+			addCriterion("estimate_refundable is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableEqualTo(BigDecimal value) {
+			addCriterion("estimate_refundable =", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableNotEqualTo(BigDecimal value) {
+			addCriterion("estimate_refundable <>", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableGreaterThan(BigDecimal value) {
+			addCriterion("estimate_refundable >", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("estimate_refundable >=", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableLessThan(BigDecimal value) {
+			addCriterion("estimate_refundable <", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("estimate_refundable <=", value, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableIn(List<BigDecimal> values) {
+			addCriterion("estimate_refundable in", values, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableNotIn(List<BigDecimal> values) {
+			addCriterion("estimate_refundable not in", values, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("estimate_refundable between", value1, value2, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andEstimateRefundableNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("estimate_refundable not between", value1, value2, "estimateRefundable");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceIsNull() {
+			addCriterion("refund_Invoice is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceIsNotNull() {
+			addCriterion("refund_Invoice is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceEqualTo(BigDecimal value) {
+			addCriterion("refund_Invoice =", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceNotEqualTo(BigDecimal value) {
+			addCriterion("refund_Invoice <>", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceGreaterThan(BigDecimal value) {
+			addCriterion("refund_Invoice >", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("refund_Invoice >=", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceLessThan(BigDecimal value) {
+			addCriterion("refund_Invoice <", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("refund_Invoice <=", value, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceIn(List<BigDecimal> values) {
+			addCriterion("refund_Invoice in", values, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceNotIn(List<BigDecimal> values) {
+			addCriterion("refund_Invoice not in", values, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_Invoice between", value1, value2, "refundInvoice");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundInvoiceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_Invoice not between", value1, value2, "refundInvoice");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Thu Aug 22 09:48:19 CST 2019
+	 * @mbg.generated  Wed Sep 18 14:33:46 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 9 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -37,7 +37,6 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.BillBo;
 import com.goafanti.order.bo.InvoiceBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
-import com.goafanti.order.bo.OrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -81,6 +80,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		t.setInvoiceAmount(invoiceAmount);//开票金额
 		BigDecimal paymentAmount=tOrderBillNewMapper.conutAmountByOrderNo(t.getOrderNo());
 		t.setPaymentAmount(paymentAmount);//收款金额
+		//预计成本与预计退款:预计成本=项目价格*数量    预计退款=收款-预计成本
+		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
+		t.setEstimateCost(estimateCost);
+		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
 		newOrderChangeMapper.insertSelective(t);
 		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNo(t.getOrderNo());
 		OrderChangeLog ocl=new OrderChangeLog();
@@ -92,6 +95,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		orderChangeLogMapper.insertSelective(ocl);
 		return 1;
 	}
+	
 	@Override
 	public NewOrderChangeBo orderChangeDetails(String orderNo) {
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByorderNo(orderNo);
@@ -126,9 +130,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}else {
 					if(nb.getProcessState()==8) {//项目变更通过
 						//changgeAdopt(nb); 取消订单变更完成
-						}else if(nb.getProcessState()==1){
-							nb.setProcessState(3);
-						} else{
+						}else {
 							nb.setProcessState(nb.getProcessState()+1);
 							}
 				}
@@ -279,10 +281,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public int addOrderRefundInvoice(OrderRefundInvoice o) {
 		o.setCreateTime(new Date());
+		newOrderChangeMapper.addRefundInvoice(o.getOrderNo(),o.getAmount());
 		return orderRefundInvoiceMapper.insertSelective(o);
 	}
 	@Override
 	public int deleteOrderRefundInvoice(Integer id) {
+		OrderRefundInvoice or=orderRefundInvoiceMapper.selectByPrimaryKey(id);
+		newOrderChangeMapper.subtractRefundInvoice(or.getOrderNo(),or.getAmount());
 		return orderRefundInvoiceMapper.deleteByPrimaryKey(id);
 	}
 	@Override

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.17
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.17
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.17
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.17
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload