Browse Source

订单变更退款、订单删除流水开发

anderx 5 years ago
parent
commit
495fdf58f9

+ 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"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="new_order_refund"/>
+    <table schema="aft" tableName="new_order_change"/>
   </context>
 </generatorConfiguration>

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

@@ -14,68 +14,68 @@ public interface NewOrderChangeMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	long countByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int deleteByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int insert(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int insertSelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	NewOrderChange selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 

+ 1 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -98,4 +98,5 @@ public interface TOrderNewMapper {
 	TOrderBillNew getLastPayment(String orderNo);
 	int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
 	List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);
+	void updaterefund(TOrderNew o);
 }

+ 52 - 20
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 Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -35,12 +35,14 @@
     <result column="estimate_refundable" jdbcType="DECIMAL" property="estimateRefundable" />
     <result column="refund_Invoice" jdbcType="DECIMAL" property="refundInvoice" />
     <result column="used_order" jdbcType="VARCHAR" property="usedOrder" />
+    <result column="refund_status" jdbcType="INTEGER" property="refundStatus" />
+    <result column="refund_url" jdbcType="VARCHAR" property="refundUrl" />
   </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 Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -74,7 +76,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -108,19 +110,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     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, estimate_cost, estimate_refundable, refund_Invoice, 
-    used_order
+    used_order, refund_status, refund_url
   </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 Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     select
     <if test="distinct">
@@ -139,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -150,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     delete from new_order_change
     where id = #{id,jdbcType=INTEGER}
@@ -159,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     delete from new_order_change
     <if test="_parameter != null">
@@ -170,7 +172,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     insert into new_order_change (id, order_no, process_state, 
       status, type, create_time, 
@@ -181,7 +183,8 @@
       invoice_time, invoice_amount, invoice_type, 
       cw_cost, refundable_amount, cw_remarks, 
       estimate_cost, estimate_refundable, refund_Invoice, 
-      used_order)
+      used_order, refund_status, refund_url
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, 
       #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{remarks,jdbcType=VARCHAR}, #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
@@ -191,13 +194,14 @@
       #{invoiceTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, 
       #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, 
       #{estimateCost,jdbcType=DECIMAL}, #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, 
-      #{usedOrder,jdbcType=VARCHAR})
+      #{usedOrder,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, #{refundUrl,jdbcType=VARCHAR}
+      )
   </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 Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     insert into new_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -285,6 +289,12 @@
       <if test="usedOrder != null">
         used_order,
       </if>
+      <if test="refundStatus != null">
+        refund_status,
+      </if>
+      <if test="refundUrl != null">
+        refund_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -371,13 +381,19 @@
       <if test="usedOrder != null">
         #{usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="refundStatus != null">
+        #{refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="refundUrl != null">
+        #{refundUrl,jdbcType=VARCHAR},
+      </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 Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     select count(*) from new_order_change
     <if test="_parameter != null">
@@ -388,7 +404,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     update new_order_change
     <set>
@@ -476,6 +492,12 @@
       <if test="record.usedOrder != null">
         used_order = #{record.usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="record.refundStatus != null">
+        refund_status = #{record.refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.refundUrl != null">
+        refund_url = #{record.refundUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -485,7 +507,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     update new_order_change
     set id = #{record.id,jdbcType=INTEGER},
@@ -515,7 +537,9 @@
       estimate_cost = #{record.estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{record.estimateRefundable,jdbcType=DECIMAL},
       refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL},
-      used_order = #{record.usedOrder,jdbcType=VARCHAR}
+      used_order = #{record.usedOrder,jdbcType=VARCHAR},
+      refund_status = #{record.refundStatus,jdbcType=INTEGER},
+      refund_url = #{record.refundUrl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -524,7 +548,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     update new_order_change
     <set>
@@ -609,6 +633,12 @@
       <if test="usedOrder != null">
         used_order = #{usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="refundStatus != null">
+        refund_status = #{refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="refundUrl != null">
+        refund_url = #{refundUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -616,7 +646,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Fri Feb 14 16:30:51 CST 2020.
     -->
     update new_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -645,7 +675,9 @@
       estimate_cost = #{estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{estimateRefundable,jdbcType=DECIMAL},
       refund_Invoice = #{refundInvoice,jdbcType=DECIMAL},
-      used_order = #{usedOrder,jdbcType=VARCHAR}
+      used_order = #{usedOrder,jdbcType=VARCHAR},
+      refund_status = #{refundStatus,jdbcType=INTEGER},
+      refund_url = #{refundUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">

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

@@ -302,7 +302,7 @@
   </update>
   
   <select id="listRefund" resultType="com.goafanti.order.bo.OutNewOrderRefund">
-    select id,cid,order_no orderNo,refund_amount refundAmount,DATE_FORMAT(reason_time,'%Y-%m-%d %H:%i:%s') refundDate
+    select id,cid,order_no orderNo,refund_amount refundAmount,DATE_FORMAT(reason_time,'%Y-%m-%d') refundDate
    from new_order_refund where cid = #{id}
   </select>
 </mapper>

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

@@ -1711,4 +1711,9 @@ where super_id is null ) e on e.order_no=a.order_no
   	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
   	where noc.order_no= #{orderNo} order by noc.create_time
   </select>
+  
+  <update id="updaterefund" parameterType="com.goafanti.common.model.TOrderNew">
+  	update t_order_new set settlement_amount=settlement_amount-#{refundAmount,jdbcType=DECIMAL},
+  	refund_amount=#{refundAmount,jdbcType=DECIMAL}	where order_no=#{orderNo}
+  </update>
 </mapper>

+ 130 - 84
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,149 +7,159 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Integer processState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String voucherUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal changeAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String depName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String projectState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal zxsCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String zxsRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Date paymentTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private Date invoiceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String invoiceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal cwCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal refundableAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String cwRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal estimateCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_refundable
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal estimateRefundable;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_Invoice
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private BigDecimal refundInvoice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	private String usedOrder;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_status
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	private Integer refundStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_url
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	private String refundUrl;
 
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -158,7 +168,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -167,7 +177,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -176,7 +186,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -185,7 +195,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -194,7 +204,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -203,7 +213,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -212,7 +222,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -221,7 +231,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -230,7 +240,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -239,7 +249,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -248,7 +258,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -257,7 +267,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -266,7 +276,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -275,7 +285,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -284,7 +294,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -293,7 +303,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -302,7 +312,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -311,7 +321,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -320,7 +330,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -329,7 +339,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -338,7 +348,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -347,7 +357,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -356,7 +366,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -365,7 +375,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getDepName() {
 		return depName;
@@ -374,7 +384,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
@@ -383,7 +393,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getProjectState() {
 		return projectState;
@@ -392,7 +402,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setProjectState(String projectState) {
 		this.projectState = projectState;
@@ -401,7 +411,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getZxsCost() {
 		return zxsCost;
@@ -410,7 +420,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setZxsCost(BigDecimal zxsCost) {
 		this.zxsCost = zxsCost;
@@ -419,7 +429,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getZxsRemarks() {
 		return zxsRemarks;
@@ -428,7 +438,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setZxsRemarks(String zxsRemarks) {
 		this.zxsRemarks = zxsRemarks;
@@ -437,7 +447,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Date getPaymentTime() {
 		return paymentTime;
@@ -446,7 +456,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setPaymentTime(Date paymentTime) {
 		this.paymentTime = paymentTime;
@@ -455,7 +465,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -464,7 +474,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -473,7 +483,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public Date getInvoiceTime() {
 		return invoiceTime;
@@ -482,7 +492,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setInvoiceTime(Date invoiceTime) {
 		this.invoiceTime = invoiceTime;
@@ -491,7 +501,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -500,7 +510,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -509,7 +519,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getInvoiceType() {
 		return invoiceType;
@@ -518,7 +528,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
@@ -527,7 +537,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getCwCost() {
 		return cwCost;
@@ -536,7 +546,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setCwCost(BigDecimal cwCost) {
 		this.cwCost = cwCost;
@@ -545,7 +555,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getRefundableAmount() {
 		return refundableAmount;
@@ -554,7 +564,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setRefundableAmount(BigDecimal refundableAmount) {
 		this.refundableAmount = refundableAmount;
@@ -563,7 +573,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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getCwRemarks() {
 		return cwRemarks;
@@ -572,7 +582,7 @@ 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setCwRemarks(String cwRemarks) {
 		this.cwRemarks = cwRemarks;
@@ -581,7 +591,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getEstimateCost() {
 		return estimateCost;
@@ -590,7 +600,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setEstimateCost(BigDecimal estimateCost) {
 		this.estimateCost = estimateCost;
@@ -599,7 +609,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getEstimateRefundable() {
 		return estimateRefundable;
@@ -608,7 +618,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setEstimateRefundable(BigDecimal estimateRefundable) {
 		this.estimateRefundable = estimateRefundable;
@@ -617,7 +627,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public BigDecimal getRefundInvoice() {
 		return refundInvoice;
@@ -626,7 +636,7 @@ public class NewOrderChange {
 	/**
 	 * 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setRefundInvoice(BigDecimal refundInvoice) {
 		this.refundInvoice = refundInvoice;
@@ -635,7 +645,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.used_order
 	 * @return  the value of new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public String getUsedOrder() {
 		return usedOrder;
@@ -644,9 +654,45 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.used_order
 	 * @param usedOrder  the value for new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public void setUsedOrder(String usedOrder) {
 		this.usedOrder = usedOrder;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_status
+	 * @return  the value of new_order_change.refund_status
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	public Integer getRefundStatus() {
+		return refundStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_status
+	 * @param refundStatus  the value for new_order_change.refund_status
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	public void setRefundStatus(Integer refundStatus) {
+		this.refundStatus = refundStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_url
+	 * @return  the value of new_order_change.refund_url
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	public String getRefundUrl() {
+		return refundUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_url
+	 * @param refundUrl  the value for new_order_change.refund_url
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
+	 */
+	public void setRefundUrl(String refundUrl) {
+		this.refundUrl = refundUrl;
+	}
 }

+ 146 - 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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	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  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1943,11 +1943,141 @@ public class NewOrderChangeExample {
 			addCriterion("used_order not between", value1, value2, "usedOrder");
 			return (Criteria) this;
 		}
+
+		public Criteria andRefundStatusIsNull() {
+			addCriterion("refund_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusIsNotNull() {
+			addCriterion("refund_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusEqualTo(Integer value) {
+			addCriterion("refund_status =", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotEqualTo(Integer value) {
+			addCriterion("refund_status <>", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusGreaterThan(Integer value) {
+			addCriterion("refund_status >", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("refund_status >=", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusLessThan(Integer value) {
+			addCriterion("refund_status <", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("refund_status <=", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusIn(List<Integer> values) {
+			addCriterion("refund_status in", values, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotIn(List<Integer> values) {
+			addCriterion("refund_status not in", values, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusBetween(Integer value1, Integer value2) {
+			addCriterion("refund_status between", value1, value2, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("refund_status not between", value1, value2, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIsNull() {
+			addCriterion("refund_url is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIsNotNull() {
+			addCriterion("refund_url is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlEqualTo(String value) {
+			addCriterion("refund_url =", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotEqualTo(String value) {
+			addCriterion("refund_url <>", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlGreaterThan(String value) {
+			addCriterion("refund_url >", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlGreaterThanOrEqualTo(String value) {
+			addCriterion("refund_url >=", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLessThan(String value) {
+			addCriterion("refund_url <", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLessThanOrEqualTo(String value) {
+			addCriterion("refund_url <=", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLike(String value) {
+			addCriterion("refund_url like", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotLike(String value) {
+			addCriterion("refund_url not like", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIn(List<String> values) {
+			addCriterion("refund_url in", values, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotIn(List<String> values) {
+			addCriterion("refund_url not in", values, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlBetween(String value1, String value2) {
+			addCriterion("refund_url between", value1, value2, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotBetween(String value1, String value2) {
+			addCriterion("refund_url not between", value1, value2, "refundUrl");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Fri Feb 14 16:30:51 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 10 - 0
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -281,6 +281,16 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 删除流水
+	 * 
+	 */
+	@RequestMapping(value="/deleteMyBill", method = RequestMethod.GET)
+	public Result deleteMyBill(String billNo){
+		Result res = new Result();
+		res.setData(orderBillServiceImpl.deleteMyBill(billNo));
+		return res;
+	}
+	/**
 	 * 查看部门的流水
 	 * @param billNew
 	 * @param pageNo

+ 15 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -422,6 +422,10 @@ public class OrderChangeApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"时间", "时间"));
 			return res;
 		}
+		if (orderChangeService.checkrefund(or)) {
+			res.getError().add(buildError("金额与实际收款不符", "金额与实际收款不符"));
+			return res;
+		}
 		res.setData(orderChangeService.addOrderRefund(or));
 		return res;
 	}
@@ -445,4 +449,15 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(orderChangeService.listRefund(id));
 		return res;
 	}
+	
+	/**
+	 * 确认退款
+	 */
+	@RequestMapping(value = "/pushRefund", method = RequestMethod.POST)
+	public Result pushRefund(Integer id,String refundUrl){
+		Result res = new Result();
+		res.setData(orderChangeService.pushRefund(id,refundUrl));
+		return res;
+	}
+	
 }

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

@@ -23,4 +23,6 @@ public interface OrderBillService {
 	 * @return
 	 */
 	XSSFWorkbook exportBillData(TOrderBillNew billNew);
+
+	int deleteMyBill(String billNo);
 }

+ 4 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -83,5 +83,9 @@ public interface OrderChangeService {
 
 	List<OutNewOrderRefund> listRefund(Integer id);
 
+	int pushRefund(Integer id, String refundUrl);
+
+	boolean checkrefund(InputNewOrderRefund or);
+
 
 }

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

@@ -427,7 +427,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		
 		//新增退款流水
 		billNew.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
-		//System.out.println("*****************"+billNew.getBillNo());
 		billNew.setCreater(TokenManager.getAdminId());
 		billNew.setTransactionAmount(billNew.getTransactionAmount().negate());// 取负数
 		int result = billNewMapper.insertSelective(billNew);
@@ -438,7 +437,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
 		//这里修改退款金额数据之前退的金额加上本次退的金额
 		orderNew.setRefundAmount(billNew.getTransactionAmount().add(o.getRefundAmount()));
-		
+		orderNew.setRefundAmount(o.getSettlementAmount().subtract(billNew.getTransactionAmount().abs()));
 		orderNew.setLiquidationStatus(lstaus);
 		if(lstaus == 4){//如果款项全部退完就更改订单状态,这里不一定待商榷
 			addOrderLog(billNew.getOrderNo(), OrderLogProcess.WCTD.getCode());

+ 20 - 0
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -12,7 +12,9 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderBillNewMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderBillNew;
+import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -25,6 +27,8 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	
 	@Autowired
 	private TOrderBillNewMapper billNewMapper;
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
 	@Value(value = "${upload.path}")
 	private String	uploadPath = null;
 
@@ -71,6 +75,22 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		
 		return wb;
 	}
+
+
+	@Override
+	public int deleteMyBill(String billNo) {
+		TOrderBillNew tbn=billNewMapper.selectByPrimaryKey(billNo);
+		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(tbn.getOrderNo());
+		TOrderNew o2=new TOrderNew();
+		o2.setOrderNo(o.getOrderNo());
+		o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));
+		tOrderNewMapper.updateByPrimaryKeySelective(o2);
+		TOrderBillNew ntbn=new TOrderBillNew();
+		ntbn.setBillNo(tbn.getBillNo());
+		ntbn.setDeleteSign((byte)1);
+		billNewMapper.updateByPrimaryKeySelective(ntbn);
+		return 1;
+	}
 	
 
 	

+ 58 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -48,6 +48,7 @@ import com.goafanti.common.model.OrderExamine;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
+import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
@@ -78,6 +79,7 @@ import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.OrderType;
+import com.goafanti.order.service.FundManageOrderService;
 import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderChangeService;
 import com.goafanti.order.service.OrderNewService;
@@ -98,8 +100,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TOrderTaskMapper	tOrderTaskMapper;
 	@Autowired
-	private TOrderBillNewMapper	tOrderBillNewMapper;
-	@Autowired
 	private TOrderInvoiceMapper	tOrderInvoiceMapper;
 	@Autowired
 	private OrderRefundInvoiceMapper	orderRefundInvoiceMapper;
@@ -120,11 +120,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderNewService	orderNewService;
 	@Autowired
+	private FundManageOrderService fundManageOrderService;
+	@Autowired
 	private NewOrderDunService	newOrderDunService;
 	@Autowired
 	private TChangeTaskMapper	TChangeTaskMapper;
 	@Autowired
 	private TChangeDunMapper	TChangeDunMapper;
+	@Autowired
+	private TOrderBillNewMapper tOrderBillNewMapper;
 	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
@@ -847,4 +851,56 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			public List<OutNewOrderRefund> listRefund(Integer id) {
 				return newOrderRefundMapper.listRefund(id);
 			}
+
+			@Override
+			public int pushRefund(Integer id,String refundUrl) {
+				NewOrderChange noc=newOrderChangeMapper.selectByPrimaryKey(id);
+				if (noc.getRefundStatus()!=1) {
+					List<OutNewOrderRefund> list=listRefund(id);
+					BigDecimal bd=new BigDecimal(0);
+					TOrderNew order=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
+					for (OutNewOrderRefund o : list) {
+						TOrderBillNew tbn =new TOrderBillNew();
+						tbn.setOrderNo(o.getOrderNo());
+						tbn.setTransactionAmount(o.getRefundAmount().negate());// 取负数
+						tbn.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
+						tbn.setCreater(TokenManager.getAdminId());
+						tbn.setPayeeId(order.getBuyerId());
+						tbn.setPayerId("0");
+						tbn.setTransactionSubject(2);
+						tbn.setTransactionChannel(2);
+						tbn.setConfirmSign(1);
+						bd=bd.add(o.getRefundAmount());
+						int result = tOrderBillNewMapper.insertSelective(tbn);
+					}
+					TOrderNew o=new TOrderNew();
+					o.setOrderNo(noc.getOrderNo());
+					o.setRefundAmount(bd);
+					tOrderNewMapper.updaterefund(o);
+					NewOrderChange n=new NewOrderChange();
+					n.setId(id);
+					n.setRefundStatus(1);
+					n.setRefundUrl(refundUrl);
+					newOrderChangeMapper.updateByPrimaryKeySelective(n);
+				}
+				return 1;
+			}
+
+			@Override
+			public boolean checkrefund(InputNewOrderRefund or) {
+				if (or.getOrderNo()!=null) {
+					TOrderNew o=tOrderNewMapper.selectByPrimaryKey(or.getOrderNo());
+					BigDecimal refund=new BigDecimal(0);
+					List<OutNewOrderRefund> list=listRefund(or.getCid());
+					for (OutNewOrderRefund oor : list) {
+						refund=refund.add(oor.getRefundAmount());
+					}
+					if (o.getSettlementAmount().compareTo(refund)!=-1) {
+						return false;
+					}else {
+						return true;
+					}	
+				}
+				return true;
+			}
 }