Bladeren bron

订单变更退款开发

anderx 6 jaren geleden
bovenliggende
commit
540470b301

+ 0 - 22
GeneratorConfig.xml

@@ -11,26 +11,4 @@
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
     <table schema="aft" tableName="new_order_refund"/>
   </context>
-
-    
-   <!--  <context id="mysql">
-            <commentGenerator>
-                <property name="suppressDate" value="true" />
-                <property name="suppressAllComments" value="true" />
-            </commentGenerator>
-            <jdbcConnection
-                    connectionURL="jdbc:mysql://101.37.32.31:3306/aft?serverTimezone=GMT%2B8"
-                    driverClass="com.mysql.cj.jdbc.Driver" password="dev123456" userId="dev" />
-            <javaTypeResolver>
-                <property name="forceBigDecimals" value="false" />
-            </javaTypeResolver>
-            <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" >
-                <property name="constructorBased" value="false"/>
-            </javaModelGenerator>
-            <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server"/>
-            <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="SPRING" >
-            </javaClientGenerator>
-            <table  tableName="new_order_refund"  enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"     enableSelectByExample="false"> </table>         	   
-</context> -->
-  
 </generatorConfiguration>

+ 2 - 0
pom.xml

@@ -452,6 +452,8 @@
 		</repository>
 	</repositories>
 
+
+    
 	<pluginRepositories>
 		<pluginRepository>
 			<id>aliyun-plugin</id>

+ 15 - 30
src/main/java/com/goafanti/common/dao/NewOrderRefundMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.NewOrderRefundExample;
+import com.goafanti.order.bo.OutNewOrderRefund;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,87 +11,70 @@ public interface NewOrderRefundMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	long countByExample(NewOrderRefundExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int deleteByExample(NewOrderRefundExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int insert(NewOrderRefund record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int insertSelective(NewOrderRefund record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	List<NewOrderRefund> selectByExampleWithBLOBs(NewOrderRefundExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	List<NewOrderRefund> selectByExample(NewOrderRefundExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	NewOrderRefund selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderRefund record,
 			@Param("example") NewOrderRefundExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	int updateByExampleWithBLOBs(@Param("record") NewOrderRefund record,
-			@Param("example") NewOrderRefundExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int updateByExample(@Param("record") NewOrderRefund record, @Param("example") NewOrderRefundExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderRefund record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	int updateByPrimaryKeyWithBLOBs(NewOrderRefund record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderRefund record);
+
+	List<OutNewOrderRefund> listRefund(Integer id);
 }

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

@@ -5,30 +5,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
-    <result column="refund_status" jdbcType="INTEGER" property="refundStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="type_explain" jdbcType="INTEGER" property="typeExplain" />
+    <result column="reason_time" jdbcType="TIMESTAMP" property="reasonTime" />
     <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
-    <result column="reason" jdbcType="VARCHAR" property="reason" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.NewOrderRefund">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
-    -->
-    <result column="reason_attachment_url" jdbcType="LONGVARCHAR" property="reasonAttachmentUrl" />
   </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 Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,44 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
-    id, order_no, refund_status, create_time, type, type_explain, refund_amount, reason
+    id, cid, order_no, create_time, reason_time, refund_amount
   </sql>
-  <sql id="Blob_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
-    -->
-    reason_attachment_url
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.NewOrderRefundExample" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from new_order_refund
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     select
     <if test="distinct">
@@ -148,16 +109,14 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from new_order_refund
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -165,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     delete from new_order_refund
     where id = #{id,jdbcType=INTEGER}
@@ -174,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     delete from new_order_refund
     <if test="_parameter != null">
@@ -185,88 +144,68 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
-    insert into new_order_refund (id, order_no, refund_status, 
-      create_time, type, type_explain, 
-      refund_amount, reason, reason_attachment_url
+    insert into new_order_refund (id, cid, order_no, 
+      create_time, reason_time, refund_amount
       )
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER}, #{typeExplain,jdbcType=INTEGER}, 
-      #{refundAmount,jdbcType=DECIMAL}, #{reason,jdbcType=VARCHAR}, #{reasonAttachmentUrl,jdbcType=LONGVARCHAR}
+    values (#{id,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{reasonTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderRefund">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     insert into new_order_refund
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
+      <if test="cid != null">
+        cid,
+      </if>
       <if test="orderNo != null">
         order_no,
       </if>
-      <if test="refundStatus != null">
-        refund_status,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="typeExplain != null">
-        type_explain,
+      <if test="reasonTime != null">
+        reason_time,
       </if>
       <if test="refundAmount != null">
         refund_amount,
       </if>
-      <if test="reason != null">
-        reason,
-      </if>
-      <if test="reasonAttachmentUrl != null">
-        reason_attachment_url,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
-      <if test="refundStatus != null">
-        #{refundStatus,jdbcType=INTEGER},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="typeExplain != null">
-        #{typeExplain,jdbcType=INTEGER},
+      <if test="reasonTime != null">
+        #{reasonTime,jdbcType=TIMESTAMP},
       </if>
       <if test="refundAmount != null">
         #{refundAmount,jdbcType=DECIMAL},
       </if>
-      <if test="reason != null">
-        #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="reasonAttachmentUrl != null">
-        #{reasonAttachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     select count(*) from new_order_refund
     <if test="_parameter != null">
@@ -277,77 +216,46 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     update new_order_refund
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
       <if test="record.orderNo != null">
         order_no = #{record.orderNo,jdbcType=VARCHAR},
       </if>
-      <if test="record.refundStatus != null">
-        refund_status = #{record.refundStatus,jdbcType=INTEGER},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.typeExplain != null">
-        type_explain = #{record.typeExplain,jdbcType=INTEGER},
+      <if test="record.reasonTime != null">
+        reason_time = #{record.reasonTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.refundAmount != null">
         refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
       </if>
-      <if test="record.reason != null">
-        reason = #{record.reason,jdbcType=VARCHAR},
-      </if>
-      <if test="record.reasonAttachmentUrl != null">
-        reason_attachment_url = #{record.reasonAttachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
-    -->
-    update new_order_refund
-    set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      refund_status = #{record.refundStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      type = #{record.type,jdbcType=INTEGER},
-      type_explain = #{record.typeExplain,jdbcType=INTEGER},
-      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
-      reason = #{record.reason,jdbcType=VARCHAR},
-      reason_attachment_url = #{record.reasonAttachmentUrl,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     update new_order_refund
     set id = #{record.id,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
-      refund_status = #{record.refundStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      type = #{record.type,jdbcType=INTEGER},
-      type_explain = #{record.typeExplain,jdbcType=INTEGER},
-      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
-      reason = #{record.reason,jdbcType=VARCHAR}
+      reason_time = #{record.reasonTime,jdbcType=TIMESTAMP},
+      refund_amount = #{record.refundAmount,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -356,68 +264,45 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     update new_order_refund
     <set>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
-      <if test="refundStatus != null">
-        refund_status = #{refundStatus,jdbcType=INTEGER},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-      <if test="typeExplain != null">
-        type_explain = #{typeExplain,jdbcType=INTEGER},
+      <if test="reasonTime != null">
+        reason_time = #{reasonTime,jdbcType=TIMESTAMP},
       </if>
       <if test="refundAmount != null">
         refund_amount = #{refundAmount,jdbcType=DECIMAL},
       </if>
-      <if test="reason != null">
-        reason = #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="reasonAttachmentUrl != null">
-        reason_attachment_url = #{reasonAttachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.NewOrderRefund">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
-    -->
-    update new_order_refund
-    set order_no = #{orderNo,jdbcType=VARCHAR},
-      refund_status = #{refundStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      type = #{type,jdbcType=INTEGER},
-      type_explain = #{typeExplain,jdbcType=INTEGER},
-      refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      reason = #{reason,jdbcType=VARCHAR},
-      reason_attachment_url = #{reasonAttachmentUrl,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.NewOrderRefund">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 11 14:40:29 CST 2020.
+      This element was generated on Thu Feb 13 11:35:58 CST 2020.
     -->
     update new_order_refund
-    set order_no = #{orderNo,jdbcType=VARCHAR},
-      refund_status = #{refundStatus,jdbcType=INTEGER},
+    set cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      type = #{type,jdbcType=INTEGER},
-      type_explain = #{typeExplain,jdbcType=INTEGER},
-      refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      reason = #{reason,jdbcType=VARCHAR}
+      reason_time = #{reasonTime,jdbcType=TIMESTAMP},
+      refund_amount = #{refundAmount,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </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
+   from new_order_refund where cid = #{id}
+  </select>
 </mapper>

+ 48 - 117
src/main/java/com/goafanti/common/model/NewOrderRefund.java

@@ -8,54 +8,39 @@ public class NewOrderRefund {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.id
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	private Integer id;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.order_no
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.cid
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	private String orderNo;
+	private Integer cid;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_status
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.order_no
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	private Integer refundStatus;
+	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.create_time
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.type
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.reason_time
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	private Integer type;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.type_explain
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	private Integer typeExplain;
+	private Date reasonTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_amount
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	private BigDecimal refundAmount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.reason
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	private String reason;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.reason_attachment_url
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	private String reasonAttachmentUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.id
 	 * @return  the value of new_order_refund.id
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -64,52 +49,52 @@ public class NewOrderRefund {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.id
 	 * @param id  the value for new_order_refund.id
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.order_no
-	 * @return  the value of new_order_refund.order_no
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.cid
+	 * @return  the value of new_order_refund.cid
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public String getOrderNo() {
-		return orderNo;
+	public Integer getCid() {
+		return cid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.order_no
-	 * @param orderNo  the value for new_order_refund.order_no
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.cid
+	 * @param cid  the value for new_order_refund.cid
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
+	public void setCid(Integer cid) {
+		this.cid = cid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.refund_status
-	 * @return  the value of new_order_refund.refund_status
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.order_no
+	 * @return  the value of new_order_refund.order_no
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public Integer getRefundStatus() {
-		return refundStatus;
+	public String getOrderNo() {
+		return orderNo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.refund_status
-	 * @param refundStatus  the value for new_order_refund.refund_status
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.order_no
+	 * @param orderNo  the value for new_order_refund.order_no
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public void setRefundStatus(Integer refundStatus) {
-		this.refundStatus = refundStatus;
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.create_time
 	 * @return  the value of new_order_refund.create_time
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -118,52 +103,34 @@ public class NewOrderRefund {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.create_time
 	 * @param createTime  the value for new_order_refund.create_time
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.type
-	 * @return  the value of new_order_refund.type
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.reason_time
+	 * @return  the value of new_order_refund.reason_time
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public Integer getType() {
-		return type;
+	public Date getReasonTime() {
+		return reasonTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.type
-	 * @param type  the value for new_order_refund.type
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.reason_time
+	 * @param reasonTime  the value for new_order_refund.reason_time
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.type_explain
-	 * @return  the value of new_order_refund.type_explain
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public Integer getTypeExplain() {
-		return typeExplain;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.type_explain
-	 * @param typeExplain  the value for new_order_refund.type_explain
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public void setTypeExplain(Integer typeExplain) {
-		this.typeExplain = typeExplain;
+	public void setReasonTime(Date reasonTime) {
+		this.reasonTime = reasonTime;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.refund_amount
 	 * @return  the value of new_order_refund.refund_amount
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public BigDecimal getRefundAmount() {
 		return refundAmount;
@@ -172,46 +139,10 @@ public class NewOrderRefund {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.refund_amount
 	 * @param refundAmount  the value for new_order_refund.refund_amount
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void setRefundAmount(BigDecimal refundAmount) {
 		this.refundAmount = refundAmount;
 	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.reason
-	 * @return  the value of new_order_refund.reason
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public String getReason() {
-		return reason;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.reason
-	 * @param reason  the value for new_order_refund.reason
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.reason_attachment_url
-	 * @return  the value of new_order_refund.reason_attachment_url
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public String getReasonAttachmentUrl() {
-		return reasonAttachmentUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.reason_attachment_url
-	 * @param reasonAttachmentUrl  the value for new_order_refund.reason_attachment_url
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
-	 */
-	public void setReasonAttachmentUrl(String reasonAttachmentUrl) {
-		this.reasonAttachmentUrl = reasonAttachmentUrl;
-	}
 	
 }

+ 92 - 222
src/main/java/com/goafanti/common/model/NewOrderRefundExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class NewOrderRefundExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public NewOrderRefundExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderRefundExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -224,133 +224,133 @@ public class NewOrderRefundExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoIsNull() {
-			addCriterion("order_no is null");
+		public Criteria andCidIsNull() {
+			addCriterion("cid is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoIsNotNull() {
-			addCriterion("order_no is not null");
+		public Criteria andCidIsNotNull() {
+			addCriterion("cid is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoEqualTo(String value) {
-			addCriterion("order_no =", value, "orderNo");
+		public Criteria andCidEqualTo(Integer value) {
+			addCriterion("cid =", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoNotEqualTo(String value) {
-			addCriterion("order_no <>", value, "orderNo");
+		public Criteria andCidNotEqualTo(Integer value) {
+			addCriterion("cid <>", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoGreaterThan(String value) {
-			addCriterion("order_no >", value, "orderNo");
+		public Criteria andCidGreaterThan(Integer value) {
+			addCriterion("cid >", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
-			addCriterion("order_no >=", value, "orderNo");
+		public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("cid >=", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoLessThan(String value) {
-			addCriterion("order_no <", value, "orderNo");
+		public Criteria andCidLessThan(Integer value) {
+			addCriterion("cid <", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoLessThanOrEqualTo(String value) {
-			addCriterion("order_no <=", value, "orderNo");
+		public Criteria andCidLessThanOrEqualTo(Integer value) {
+			addCriterion("cid <=", value, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoLike(String value) {
-			addCriterion("order_no like", value, "orderNo");
+		public Criteria andCidIn(List<Integer> values) {
+			addCriterion("cid in", values, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoNotLike(String value) {
-			addCriterion("order_no not like", value, "orderNo");
+		public Criteria andCidNotIn(List<Integer> values) {
+			addCriterion("cid not in", values, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoIn(List<String> values) {
-			addCriterion("order_no in", values, "orderNo");
+		public Criteria andCidBetween(Integer value1, Integer value2) {
+			addCriterion("cid between", value1, value2, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoNotIn(List<String> values) {
-			addCriterion("order_no not in", values, "orderNo");
+		public Criteria andCidNotBetween(Integer value1, Integer value2) {
+			addCriterion("cid not between", value1, value2, "cid");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoBetween(String value1, String value2) {
-			addCriterion("order_no between", value1, value2, "orderNo");
+		public Criteria andOrderNoIsNull() {
+			addCriterion("order_no is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderNoNotBetween(String value1, String value2) {
-			addCriterion("order_no not between", value1, value2, "orderNo");
+		public Criteria andOrderNoIsNotNull() {
+			addCriterion("order_no is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusIsNull() {
-			addCriterion("refund_status is null");
+		public Criteria andOrderNoEqualTo(String value) {
+			addCriterion("order_no =", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusIsNotNull() {
-			addCriterion("refund_status is not null");
+		public Criteria andOrderNoNotEqualTo(String value) {
+			addCriterion("order_no <>", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusEqualTo(Integer value) {
-			addCriterion("refund_status =", value, "refundStatus");
+		public Criteria andOrderNoGreaterThan(String value) {
+			addCriterion("order_no >", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusNotEqualTo(Integer value) {
-			addCriterion("refund_status <>", value, "refundStatus");
+		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+			addCriterion("order_no >=", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusGreaterThan(Integer value) {
-			addCriterion("refund_status >", value, "refundStatus");
+		public Criteria andOrderNoLessThan(String value) {
+			addCriterion("order_no <", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusGreaterThanOrEqualTo(Integer value) {
-			addCriterion("refund_status >=", value, "refundStatus");
+		public Criteria andOrderNoLessThanOrEqualTo(String value) {
+			addCriterion("order_no <=", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusLessThan(Integer value) {
-			addCriterion("refund_status <", value, "refundStatus");
+		public Criteria andOrderNoLike(String value) {
+			addCriterion("order_no like", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusLessThanOrEqualTo(Integer value) {
-			addCriterion("refund_status <=", value, "refundStatus");
+		public Criteria andOrderNoNotLike(String value) {
+			addCriterion("order_no not like", value, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusIn(List<Integer> values) {
-			addCriterion("refund_status in", values, "refundStatus");
+		public Criteria andOrderNoIn(List<String> values) {
+			addCriterion("order_no in", values, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusNotIn(List<Integer> values) {
-			addCriterion("refund_status not in", values, "refundStatus");
+		public Criteria andOrderNoNotIn(List<String> values) {
+			addCriterion("order_no not in", values, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusBetween(Integer value1, Integer value2) {
-			addCriterion("refund_status between", value1, value2, "refundStatus");
+		public Criteria andOrderNoBetween(String value1, String value2) {
+			addCriterion("order_no between", value1, value2, "orderNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundStatusNotBetween(Integer value1, Integer value2) {
-			addCriterion("refund_status not between", value1, value2, "refundStatus");
+		public Criteria andOrderNoNotBetween(String value1, String value2) {
+			addCriterion("order_no not between", value1, value2, "orderNo");
 			return (Criteria) this;
 		}
 
@@ -414,123 +414,63 @@ public class NewOrderRefundExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNull() {
-			addCriterion("type is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeIsNotNull() {
-			addCriterion("type is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeEqualTo(Integer value) {
-			addCriterion("type =", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeNotEqualTo(Integer value) {
-			addCriterion("type <>", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeGreaterThan(Integer value) {
-			addCriterion("type >", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
-			addCriterion("type >=", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeLessThan(Integer value) {
-			addCriterion("type <", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
-			addCriterion("type <=", value, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeIn(List<Integer> values) {
-			addCriterion("type in", values, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeNotIn(List<Integer> values) {
-			addCriterion("type not in", values, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
-			addCriterion("type between", value1, value2, "type");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
-			addCriterion("type not between", value1, value2, "type");
+		public Criteria andReasonTimeIsNull() {
+			addCriterion("reason_time is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainIsNull() {
-			addCriterion("type_explain is null");
+		public Criteria andReasonTimeIsNotNull() {
+			addCriterion("reason_time is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainIsNotNull() {
-			addCriterion("type_explain is not null");
+		public Criteria andReasonTimeEqualTo(Date value) {
+			addCriterion("reason_time =", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainEqualTo(Integer value) {
-			addCriterion("type_explain =", value, "typeExplain");
+		public Criteria andReasonTimeNotEqualTo(Date value) {
+			addCriterion("reason_time <>", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainNotEqualTo(Integer value) {
-			addCriterion("type_explain <>", value, "typeExplain");
+		public Criteria andReasonTimeGreaterThan(Date value) {
+			addCriterion("reason_time >", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainGreaterThan(Integer value) {
-			addCriterion("type_explain >", value, "typeExplain");
+		public Criteria andReasonTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("reason_time >=", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainGreaterThanOrEqualTo(Integer value) {
-			addCriterion("type_explain >=", value, "typeExplain");
+		public Criteria andReasonTimeLessThan(Date value) {
+			addCriterion("reason_time <", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainLessThan(Integer value) {
-			addCriterion("type_explain <", value, "typeExplain");
+		public Criteria andReasonTimeLessThanOrEqualTo(Date value) {
+			addCriterion("reason_time <=", value, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainLessThanOrEqualTo(Integer value) {
-			addCriterion("type_explain <=", value, "typeExplain");
+		public Criteria andReasonTimeIn(List<Date> values) {
+			addCriterion("reason_time in", values, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainIn(List<Integer> values) {
-			addCriterion("type_explain in", values, "typeExplain");
+		public Criteria andReasonTimeNotIn(List<Date> values) {
+			addCriterion("reason_time not in", values, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainNotIn(List<Integer> values) {
-			addCriterion("type_explain not in", values, "typeExplain");
+		public Criteria andReasonTimeBetween(Date value1, Date value2) {
+			addCriterion("reason_time between", value1, value2, "reasonTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeExplainBetween(Integer value1, Integer value2) {
-			addCriterion("type_explain between", value1, value2, "typeExplain");
-			return (Criteria) this;
-		}
-
-		public Criteria andTypeExplainNotBetween(Integer value1, Integer value2) {
-			addCriterion("type_explain not between", value1, value2, "typeExplain");
+		public Criteria andReasonTimeNotBetween(Date value1, Date value2) {
+			addCriterion("reason_time not between", value1, value2, "reasonTime");
 			return (Criteria) this;
 		}
 
@@ -593,81 +533,11 @@ public class NewOrderRefundExample {
 			addCriterion("refund_amount not between", value1, value2, "refundAmount");
 			return (Criteria) this;
 		}
-
-		public Criteria andReasonIsNull() {
-			addCriterion("reason is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonIsNotNull() {
-			addCriterion("reason is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonEqualTo(String value) {
-			addCriterion("reason =", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonNotEqualTo(String value) {
-			addCriterion("reason <>", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonGreaterThan(String value) {
-			addCriterion("reason >", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonGreaterThanOrEqualTo(String value) {
-			addCriterion("reason >=", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonLessThan(String value) {
-			addCriterion("reason <", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonLessThanOrEqualTo(String value) {
-			addCriterion("reason <=", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonLike(String value) {
-			addCriterion("reason like", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonNotLike(String value) {
-			addCriterion("reason not like", value, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonIn(List<String> values) {
-			addCriterion("reason in", values, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonNotIn(List<String> values) {
-			addCriterion("reason not in", values, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonBetween(String value1, String value2) {
-			addCriterion("reason between", value1, value2, "reason");
-			return (Criteria) this;
-		}
-
-		public Criteria andReasonNotBetween(String value1, String value2) {
-			addCriterion("reason not between", value1, value2, "reason");
-			return (Criteria) this;
-		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_refund
-	 * @mbg.generated  Tue Feb 11 14:40:29 CST 2020
+	 * @mbg.generated  Thu Feb 13 11:35:58 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 17 - 0
src/main/java/com/goafanti/order/bo/InputNewOrderRefund.java

@@ -0,0 +1,17 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.NewOrderRefund;
+
+public class InputNewOrderRefund extends NewOrderRefund {
+
+	
+	private String refundDate;
+
+	public String getRefundDate() {
+		return refundDate;
+	}
+
+	public void setRefundDate(String refundDate) {
+		this.refundDate = refundDate;
+	}
+}

+ 15 - 0
src/main/java/com/goafanti/order/bo/OutNewOrderRefund.java

@@ -0,0 +1,15 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.NewOrderRefund;
+
+public class OutNewOrderRefund  extends NewOrderRefund{
+	private String refundDate;
+
+	public String getRefundDate() {
+		return refundDate;
+	}
+
+	public void setRefundDate(String refundDate) {
+		this.refundDate = refundDate;
+	}
+}

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

@@ -14,10 +14,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
@@ -394,4 +396,53 @@ public class OrderChangeApiController extends CertifyApiController {
     	return res;
     }
 	
+    
+    /**
+	 *	  变更退款图片文件上传 
+	 */
+	@RequestMapping(value = "/uploadRefund", method = RequestMethod.POST)
+	public Result uploadRefund(HttpServletRequest req,String sign){
+		Result res = new Result();
+		//order_refund_file
+		res.setData(handleFile(res, "/order_refund/", false, req, sign));
+		return res;
+	}
+	
+	/**
+	 *	  新增退款信息 
+	 */
+	@RequestMapping(value = "/addRefund", method = RequestMethod.POST)
+	public Result addRefund(InputNewOrderRefund or){
+		Result res = new Result();
+		if (or.getRefundAmount()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"金额", "金额"));
+			return res;
+		}
+		if (or.getRefundDate()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"时间", "时间"));
+			return res;
+		}
+		res.setData(orderChangeService.addOrderRefund(or));
+		return res;
+	}
+	
+	/**
+	 * 删除退款信息
+	 */
+	@RequestMapping(value = "/deleteRefund", method = RequestMethod.POST)
+	public Result deleteRefund(Integer id){
+		Result res = new Result();
+		res.setData(orderChangeService.deleteRefund(id));
+		return res;
+	}
+	
+	/**
+	 * 退款信息列表
+	 */
+	@RequestMapping(value = "/listRefund", method = RequestMethod.GET)
+	public Result listRefund(Integer id){
+		Result res = new Result();
+		res.setData(orderChangeService.listRefund(id));
+		return res;
+	}
 }

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

@@ -6,14 +6,18 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.OutNewOrderRefund;
 import com.goafanti.order.bo.TChangeDunOut;
 import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -73,5 +77,11 @@ public interface OrderChangeService {
 
 	List<Map<String, String>> getOrderChange(String orderNo);
 
+	int addOrderRefund(InputNewOrderRefund or);
+
+	int deleteRefund(Integer id);
+
+	List<OutNewOrderRefund> listRefund(Integer id);
+
 
 }

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

@@ -3,6 +3,7 @@ package com.goafanti.order.service.impl;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NewOrderChangeMapper;
 import com.goafanti.common.dao.NewOrderDunMapper;
@@ -53,6 +55,7 @@ import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.model.NewOrderRefund;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -60,11 +63,13 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.BillBo;
+import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.InvoiceBo;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.OutNewOrderRefund;
 import com.goafanti.order.bo.TChangeDunOut;
 import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
@@ -822,4 +827,24 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				list =newOrderChangeMapper.getOrderChange(orderNo);
 				return list;
 			}
+
+			@Override
+			public int addOrderRefund(InputNewOrderRefund or) {
+				try {
+					or.setReasonTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+				return newOrderRefundMapper.insertSelective(or);
+			}
+
+			@Override
+			public int deleteRefund(Integer id) {
+				return newOrderRefundMapper.deleteByPrimaryKey(id);
+			}
+
+			@Override
+			public List<OutNewOrderRefund> listRefund(Integer id) {
+				return newOrderRefundMapper.listRefund(id);
+			}
 }