anderx лет назад: 5
Родитель
Сommit
f5f7a57d1d

+ 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="t_order_bill_new"/>
+    <table schema="aft" tableName="new_order_refund"/>
   </context>
 </generatorConfiguration>

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

@@ -1,80 +1,80 @@
-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;
-
-public interface NewOrderRefundMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
-	 * @mbg.generated  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	int updateByPrimaryKey(NewOrderRefund record);
-
-	List<OutNewOrderRefund> listRefund(Integer id);
+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;
+
+public interface NewOrderRefundMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int updateByPrimaryKey(NewOrderRefund record);
+
+	List<OutNewOrderRefund> listRefund(Integer id);
 }

+ 94 - 94
src/main/java/com/goafanti/common/dao/TOrderBillNewMapper.java

@@ -1,95 +1,95 @@
-package com.goafanti.common.dao;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.goafanti.common.model.TOrderBillNew;
-import com.goafanti.common.model.TOrderBillNewExample;
-import com.goafanti.order.bo.BillBo;
-
-public interface TOrderBillNewMapper {
-    /**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	long countByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int deleteByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int deleteByPrimaryKey(String billNo);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int insert(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int insertSelective(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	List<TOrderBillNew> selectByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	TOrderBillNew selectByPrimaryKey(String billNo);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int updateByExample(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int updateByPrimaryKeySelective(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
-	 */
-	int updateByPrimaryKey(TOrderBillNew record);
-
-	BigDecimal getAmountByOid(String oid);
-    
-    TOrderBillNew getOneRefundFlow(String BillNo);
-    
-    List<TOrderBillNew> getOneOrderAllRefundFlow(String oid);
-    
-    List<TOrderBillNew> getDeptBySome(TOrderBillNew ob);
-    
-    List<TOrderBillNew> getBillData(TOrderBillNew ob);
-
-	BigDecimal conutAmountByOrderNo(String orderNo);
-
-	List<BillBo> selectByOrderNo(String orderNo);
-
-	void insertBatch(List<TOrderBillNew> listBull);
-
+package com.goafanti.common.dao;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.goafanti.common.model.TOrderBillNew;
+import com.goafanti.common.model.TOrderBillNewExample;
+import com.goafanti.order.bo.BillBo;
+
+public interface TOrderBillNewMapper {
+    /**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	long countByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int deleteByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int deleteByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int insert(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int insertSelective(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	List<TOrderBillNew> selectByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	TOrderBillNew selectByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByExample(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByPrimaryKey(TOrderBillNew record);
+
+	BigDecimal getAmountByOid(String oid);
+    
+    TOrderBillNew getOneRefundFlow(String BillNo);
+    
+    List<TOrderBillNew> getOneOrderAllRefundFlow(String oid);
+    
+    List<TOrderBillNew> getDeptBySome(TOrderBillNew ob);
+    
+    List<TOrderBillNew> getBillData(TOrderBillNew ob);
+
+	BigDecimal conutAmountByOrderNo(String orderNo);
+
+	List<BillBo> selectByOrderNo(String orderNo);
+
+	void insertBatch(List<TOrderBillNew> listBull);
+
 }

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

@@ -1,323 +1,323 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.NewOrderRefundMapper">
-  <resultMap id="BaseResultMap" 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 Mon Feb 17 09:10:07 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="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="reason_time" jdbcType="TIMESTAMP" property="reasonTime" />
-    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
-  </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 Feb 17 09:10:07 CST 2020.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 09:10:07 CST 2020.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 09:10:07 CST 2020.
-    -->
-    id, cid, order_no, create_time, reason_time, refund_amount, remarks
-  </sql>
-  <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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_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="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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from new_order_refund
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 09:10:07 CST 2020.
-    -->
-    delete from new_order_refund
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 09:10:07 CST 2020.
-    -->
-    delete from new_order_refund
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" 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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    insert into new_order_refund (id, cid, order_no, 
-      create_time, reason_time, refund_amount, 
-      remarks)
-    values (#{id,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{reasonTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, 
-      #{remarks,jdbcType=VARCHAR})
-  </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 Mon Feb 17 09:10:07 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="createTime != null">
-        create_time,
-      </if>
-      <if test="reasonTime != null">
-        reason_time,
-      </if>
-      <if test="refundAmount != null">
-        refund_amount,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </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="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reasonTime != null">
-        #{reasonTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
-        #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    select count(*) from new_order_refund
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 09:10:07 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.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <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.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    update new_order_refund
-    set id = #{record.id,jdbcType=INTEGER},
-      cid = #{record.cid,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      reason_time = #{record.reasonTime,jdbcType=TIMESTAMP},
-      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
-      remarks = #{record.remarks,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" 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 Mon Feb 17 09:10:07 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="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reasonTime != null">
-        reason_time = #{reasonTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
-        refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-    </set>
-    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 Mon Feb 17 09:10:07 CST 2020.
-    -->
-    update new_order_refund
-    set cid = #{cid,jdbcType=INTEGER},
-      order_no = #{orderNo,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      reason_time = #{reasonTime,jdbcType=TIMESTAMP},
-      refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      remarks = #{remarks,jdbcType=VARCHAR}
-    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') refundDate,remarks
-   from new_order_refund  where cid = #{id}
-  </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.NewOrderRefundMapper">
+  <resultMap id="BaseResultMap" 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 Wed Feb 19 09:01:39 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="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    id, cid, order_no, create_time, refund_time, refund_amount, remarks
+  </sql>
+  <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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_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="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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from new_order_refund
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    delete from new_order_refund
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    delete from new_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" 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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    insert into new_order_refund (id, cid, order_no, 
+      create_time, refund_time, refund_amount, 
+      remarks)
+    values (#{id,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, 
+      #{remarks,jdbcType=VARCHAR})
+  </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 Wed Feb 19 09:01:39 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="createTime != null">
+        create_time,
+      </if>
+      <if test="refundTime != null">
+        refund_time,
+      </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </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="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundTime != null">
+        #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundAmount != null">
+        #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select count(*) from new_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 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.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.refundTime != null">
+        refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.refundAmount != null">
+        refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    set id = #{record.id,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
+      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" 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 Wed Feb 19 09:01:39 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="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundTime != null">
+        refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    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 Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    set cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      remarks = #{remarks,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="listRefund" resultType="com.goafanti.order.bo.OutNewOrderRefund">
+    select id,cid,order_no orderNo,refund_amount refundAmount,refund_time refundTime,DATE_FORMAT(refund_time,'%Y-%m-%d') refundDate,remarks
+   from new_order_refund  where cid = #{id}
+  </select>
 </mapper>

+ 38 - 21
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.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 Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     <id column="bill_no" jdbcType="VARCHAR" property="billNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -24,12 +24,13 @@
     <result column="financial_pay_time" jdbcType="TIMESTAMP" property="financialPayTime" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="delete_time" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
   </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 Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -63,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -97,17 +98,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     bill_no, order_no, creater, create_time, update_time, payee_id, payer_id, transaction_amount, 
     transaction_subject, transaction_channel, remarks, confirm_sign, delete_sign, financial_pay_no, 
-    financial_pay_time, type, delete_time
+    financial_pay_time, type, delete_time, refund_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     select
     <if test="distinct">
@@ -126,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -137,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     delete from t_order_bill_new
     where bill_no = #{billNo,jdbcType=VARCHAR}
@@ -146,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     delete from t_order_bill_new
     <if test="_parameter != null">
@@ -157,26 +158,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     insert into t_order_bill_new (bill_no, order_no, creater, 
       create_time, update_time, payee_id, 
       payer_id, transaction_amount, transaction_subject, 
       transaction_channel, remarks, confirm_sign, 
       delete_sign, financial_pay_no, financial_pay_time, 
-      type, delete_time)
+      type, delete_time, refund_time
+      )
     values (#{billNo,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{payeeId,jdbcType=VARCHAR}, 
       #{payerId,jdbcType=VARCHAR}, #{transactionAmount,jdbcType=DECIMAL}, #{transactionSubject,jdbcType=INTEGER}, 
       #{transactionChannel,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{confirmSign,jdbcType=INTEGER}, 
       #{deleteSign,jdbcType=TINYINT}, #{financialPayNo,jdbcType=VARCHAR}, #{financialPayTime,jdbcType=TIMESTAMP}, 
-      #{type,jdbcType=INTEGER}, #{deleteTime,jdbcType=TIMESTAMP})
+      #{type,jdbcType=INTEGER}, #{deleteTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderBillNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     insert into t_order_bill_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -231,6 +234,9 @@
       <if test="deleteTime != null">
         delete_time,
       </if>
+      <if test="refundTime != null">
+        refund_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="billNo != null">
@@ -284,13 +290,16 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="refundTime != null">
+        #{refundTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     select count(*) from t_order_bill_new
     <if test="_parameter != null">
@@ -301,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     update t_order_bill_new
     <set>
@@ -356,6 +365,9 @@
       <if test="record.deleteTime != null">
         delete_time = #{record.deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.refundTime != null">
+        refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -365,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     update t_order_bill_new
     set bill_no = #{record.billNo,jdbcType=VARCHAR},
@@ -384,7 +396,8 @@
       financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
       financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
       type = #{record.type,jdbcType=INTEGER},
-      delete_time = #{record.deleteTime,jdbcType=TIMESTAMP}
+      delete_time = #{record.deleteTime,jdbcType=TIMESTAMP},
+      refund_time = #{record.refundTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -393,7 +406,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     update t_order_bill_new
     <set>
@@ -445,6 +458,9 @@
       <if test="deleteTime != null">
         delete_time = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="refundTime != null">
+        refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
@@ -452,7 +468,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Feb 17 11:41:23 CST 2020.
+      This element was generated on Wed Feb 19 08:54:03 CST 2020.
     -->
     update t_order_bill_new
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -470,7 +486,8 @@
       financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
       financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
       type = #{type,jdbcType=INTEGER},
-      delete_time = #{deleteTime,jdbcType=TIMESTAMP}
+      delete_time = #{deleteTime,jdbcType=TIMESTAMP},
+      refund_time = #{refundTime,jdbcType=TIMESTAMP}
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
   <!-- 根据订单编号获得已交款 -->
@@ -510,7 +527,7 @@
   	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,date_format(b.create_time,'%Y-%m-%d %H:%I:%S') as createTimes,
   	b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName,  b.remarks,o.contract_no contractNo,
   	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, b.delete_sign deleteSign,
-  	date_format(b.financial_pay_time,'%Y-%m-%d') as financialPayTimes,b.financial_pay_no as financialPayNo,
+  	date_format(b.financial_pay_time,'%Y-%m-%d') as financialPayTimes,b.financial_pay_no as financialPayNo,date_format(b.refund_time,'%Y-%m-%d') refundTimes,
   	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName,b.type,date_format(b.delete_time,'%Y-%m-%d %H:%I:%S') as deleteTimes
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id

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

@@ -1,171 +1,171 @@
-package com.goafanti.common.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.annotation.Generated;
-
-public class NewOrderRefund {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.id
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.cid
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private Integer cid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.order_no
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private String orderNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.create_time
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.reason_time
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private Date reasonTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_amount
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private BigDecimal refundAmount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.remarks
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	private String remarks;
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 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.cid
-	 * @return  the value of new_order_refund.cid
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public Integer getCid() {
-		return cid;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	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.order_no
-	 * @return  the value of new_order_refund.order_no
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 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.reason_time
-	 * @return  the value of new_order_refund.reason_time
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public Date getReasonTime() {
-		return reasonTime;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	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  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public BigDecimal getRefundAmount() {
-		return refundAmount;
-	}
-
-	/**
-	 * 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  Mon Feb 17 09:10:07 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.remarks
-	 * @return  the value of new_order_refund.remarks
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.remarks
-	 * @param remarks  the value for new_order_refund.remarks
-	 * @mbg.generated  Mon Feb 17 09:10:07 CST 2020
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-	
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+
+public class NewOrderRefund {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.id
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.cid
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Integer cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.order_no
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.create_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Date refundTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_amount
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private BigDecimal refundAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private String remarks;
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 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.cid
+	 * @return  the value of new_order_refund.cid
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	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.order_no
+	 * @return  the value of new_order_refund.order_no
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 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.refund_time
+	 * @return  the value of new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Date getRefundTime() {
+		return refundTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.refund_time
+	 * @param refundTime  the value for new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setRefundTime(Date refundTime) {
+		this.refundTime = refundTime;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public BigDecimal getRefundAmount() {
+		return refundAmount;
+	}
+
+	/**
+	 * 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  Wed Feb 19 09:01:39 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.remarks
+	 * @return  the value of new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.remarks
+	 * @param remarks  the value for new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	
 }

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


+ 83 - 51
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -10,94 +10,99 @@ import com.goafanti.common.constant.AFTConstants;
 public class TOrderBillNew {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.bill_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String billNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.order_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.creater
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.create_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.update_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.payee_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String payeeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.payer_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String payerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.transaction_amount
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private BigDecimal transactionAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.transaction_subject
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Integer transactionSubject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.transaction_channel
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Integer transactionChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.remarks
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.confirm_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Integer confirmSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.delete_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Byte deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.financial_pay_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String financialPayNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.financial_pay_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Date financialPayTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.type
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.delete_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Date deleteTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.refund_time
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	private Date refundTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.bill_no
 	 * @return  the value of t_order_bill_new.bill_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getBillNo() {
 		return billNo;
@@ -106,7 +111,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.bill_no
 	 * @param billNo  the value for t_order_bill_new.bill_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setBillNo(String billNo) {
 		this.billNo = billNo;
@@ -115,7 +120,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.order_no
 	 * @return  the value of t_order_bill_new.order_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -124,7 +129,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.order_no
 	 * @param orderNo  the value for t_order_bill_new.order_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -133,7 +138,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.creater
 	 * @return  the value of t_order_bill_new.creater
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getCreater() {
 		return creater;
@@ -142,7 +147,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.creater
 	 * @param creater  the value for t_order_bill_new.creater
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -151,7 +156,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.create_time
 	 * @return  the value of t_order_bill_new.create_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -160,7 +165,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.create_time
 	 * @param createTime  the value for t_order_bill_new.create_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -169,7 +174,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.update_time
 	 * @return  the value of t_order_bill_new.update_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -178,7 +183,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.update_time
 	 * @param updateTime  the value for t_order_bill_new.update_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -187,7 +192,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.payee_id
 	 * @return  the value of t_order_bill_new.payee_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getPayeeId() {
 		return payeeId;
@@ -196,7 +201,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.payee_id
 	 * @param payeeId  the value for t_order_bill_new.payee_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setPayeeId(String payeeId) {
 		this.payeeId = payeeId;
@@ -205,7 +210,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.payer_id
 	 * @return  the value of t_order_bill_new.payer_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getPayerId() {
 		return payerId;
@@ -214,7 +219,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.payer_id
 	 * @param payerId  the value for t_order_bill_new.payer_id
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setPayerId(String payerId) {
 		this.payerId = payerId;
@@ -223,7 +228,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.transaction_amount
 	 * @return  the value of t_order_bill_new.transaction_amount
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public BigDecimal getTransactionAmount() {
 		return transactionAmount;
@@ -232,7 +237,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.transaction_amount
 	 * @param transactionAmount  the value for t_order_bill_new.transaction_amount
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setTransactionAmount(BigDecimal transactionAmount) {
 		this.transactionAmount = transactionAmount;
@@ -241,7 +246,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.transaction_subject
 	 * @return  the value of t_order_bill_new.transaction_subject
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Integer getTransactionSubject() {
 		return transactionSubject;
@@ -250,7 +255,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.transaction_subject
 	 * @param transactionSubject  the value for t_order_bill_new.transaction_subject
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setTransactionSubject(Integer transactionSubject) {
 		this.transactionSubject = transactionSubject;
@@ -259,7 +264,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.transaction_channel
 	 * @return  the value of t_order_bill_new.transaction_channel
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Integer getTransactionChannel() {
 		return transactionChannel;
@@ -268,7 +273,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.transaction_channel
 	 * @param transactionChannel  the value for t_order_bill_new.transaction_channel
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setTransactionChannel(Integer transactionChannel) {
 		this.transactionChannel = transactionChannel;
@@ -277,7 +282,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.remarks
 	 * @return  the value of t_order_bill_new.remarks
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -286,7 +291,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.remarks
 	 * @param remarks  the value for t_order_bill_new.remarks
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -295,7 +300,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.confirm_sign
 	 * @return  the value of t_order_bill_new.confirm_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Integer getConfirmSign() {
 		return confirmSign;
@@ -304,7 +309,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.confirm_sign
 	 * @param confirmSign  the value for t_order_bill_new.confirm_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setConfirmSign(Integer confirmSign) {
 		this.confirmSign = confirmSign;
@@ -313,7 +318,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.delete_sign
 	 * @return  the value of t_order_bill_new.delete_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Byte getDeleteSign() {
 		return deleteSign;
@@ -322,7 +327,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.delete_sign
 	 * @param deleteSign  the value for t_order_bill_new.delete_sign
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setDeleteSign(Byte deleteSign) {
 		this.deleteSign = deleteSign;
@@ -331,7 +336,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.financial_pay_no
 	 * @return  the value of t_order_bill_new.financial_pay_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public String getFinancialPayNo() {
 		return financialPayNo;
@@ -340,7 +345,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.financial_pay_no
 	 * @param financialPayNo  the value for t_order_bill_new.financial_pay_no
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setFinancialPayNo(String financialPayNo) {
 		this.financialPayNo = financialPayNo;
@@ -349,7 +354,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.financial_pay_time
 	 * @return  the value of t_order_bill_new.financial_pay_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Date getFinancialPayTime() {
 		return financialPayTime;
@@ -358,7 +363,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.financial_pay_time
 	 * @param financialPayTime  the value for t_order_bill_new.financial_pay_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setFinancialPayTime(Date financialPayTime) {
 		this.financialPayTime = financialPayTime;
@@ -367,7 +372,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.type
 	 * @return  the value of t_order_bill_new.type
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -376,7 +381,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.type
 	 * @param type  the value for t_order_bill_new.type
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -385,7 +390,7 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.delete_time
 	 * @return  the value of t_order_bill_new.delete_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public Date getDeleteTime() {
 		return deleteTime;
@@ -394,12 +399,30 @@ public class TOrderBillNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.delete_time
 	 * @param deleteTime  the value for t_order_bill_new.delete_time
-	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	public void setDeleteTime(Date deleteTime) {
 		this.deleteTime = deleteTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill_new.refund_time
+	 * @return  the value of t_order_bill_new.refund_time
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	public Date getRefundTime() {
+		return refundTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill_new.refund_time
+	 * @param refundTime  the value for t_order_bill_new.refund_time
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	public void setRefundTime(Date refundTime) {
+		this.refundTime = refundTime;
+	}
+
 	private String financialPayTimes;
     private String payerName;
     private String payeeName;
@@ -412,6 +435,7 @@ public class TOrderBillNew {
     private String departmentName;
 	private String createTimes;
 	private String deleteTimes;
+	private String refundTimes;
 	private String contractNo;
     
     public String getFinancialPayTimes() {
@@ -517,4 +541,12 @@ public class TOrderBillNew {
 	public void setDeleteTimes(String deleteTimes) {
 		this.deleteTimes = deleteTimes;
 	}
+
+	public String getRefundTimes() {
+		return refundTimes;
+	}
+
+	public void setRefundTimes(String refundTimes) {
+		this.refundTimes = refundTimes;
+	}
 }

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


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

@@ -835,7 +835,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			@Override
 			public int addOrderRefund(InputNewOrderRefund or) {
 				try {
-					or.setReasonTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
+					or.setRefundTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
@@ -870,8 +870,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						tbn.setTransactionSubject(2);
 						tbn.setTransactionChannel(2);
 						tbn.setConfirmSign(1);
+						tbn.setRefundTime(o.getRefundTime());
 						bd=bd.add(o.getRefundAmount());
-						int result = tOrderBillNewMapper.insertSelective(tbn);
+						tOrderBillNewMapper.insertSelective(tbn);
 					}
 					TOrderNew o=new TOrderNew();
 					o.setOrderNo(noc.getOrderNo());