Kaynağa Gözat

删除新增删除时间

anderx 5 yıl önce
ebeveyn
işleme
2a62f473e2

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -12,67 +12,67 @@ 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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderBillNew record);
 

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

@@ -709,7 +709,7 @@ select
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
   select
 	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,a.refund_url refundUrl,
-	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,a.refund_status refund_status,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,a.refund_status refundStatus,
 	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,

+ 36 - 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 Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     <id column="bill_no" jdbcType="VARCHAR" property="billNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -23,12 +23,13 @@
     <result column="financial_pay_no" jdbcType="VARCHAR" property="financialPayNo" />
     <result column="financial_pay_time" jdbcType="TIMESTAMP" property="financialPayTime" />
     <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="delete_time" jdbcType="TIMESTAMP" property="deleteTime" />
   </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 Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,17 +97,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 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
+    financial_pay_time, type, delete_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 Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     select
     <if test="distinct">
@@ -125,7 +126,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -136,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     delete from t_order_bill_new
     where bill_no = #{billNo,jdbcType=VARCHAR}
@@ -145,7 +146,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     delete from t_order_bill_new
     <if test="_parameter != null">
@@ -156,26 +157,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 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)
+      type, delete_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})
+      #{type,jdbcType=INTEGER}, #{deleteTime,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 Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     insert into t_order_bill_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -227,6 +228,9 @@
       <if test="type != null">
         type,
       </if>
+      <if test="deleteTime != null">
+        delete_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="billNo != null">
@@ -277,13 +281,16 @@
       <if test="type != null">
         #{type,jdbcType=INTEGER},
       </if>
+      <if test="deleteTime != null">
+        #{deleteTime,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 Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     select count(*) from t_order_bill_new
     <if test="_parameter != null">
@@ -294,7 +301,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     update t_order_bill_new
     <set>
@@ -346,6 +353,9 @@
       <if test="record.type != null">
         type = #{record.type,jdbcType=INTEGER},
       </if>
+      <if test="record.deleteTime != null">
+        delete_time = #{record.deleteTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -355,7 +365,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     update t_order_bill_new
     set bill_no = #{record.billNo,jdbcType=VARCHAR},
@@ -373,7 +383,8 @@
       delete_sign = #{record.deleteSign,jdbcType=TINYINT},
       financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
       financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
-      type = #{record.type,jdbcType=INTEGER}
+      type = #{record.type,jdbcType=INTEGER},
+      delete_time = #{record.deleteTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -382,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     update t_order_bill_new
     <set>
@@ -431,6 +442,9 @@
       <if test="type != null">
         type = #{type,jdbcType=INTEGER},
       </if>
+      <if test="deleteTime != null">
+        delete_time = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
@@ -438,7 +452,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 09:49:04 CST 2019.
+      This element was generated on Mon Feb 17 11:41:23 CST 2020.
     -->
     update t_order_bill_new
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -455,7 +469,8 @@
       delete_sign = #{deleteSign,jdbcType=TINYINT},
       financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
       financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
-      type = #{type,jdbcType=INTEGER}
+      type = #{type,jdbcType=INTEGER},
+      delete_time = #{deleteTime,jdbcType=TIMESTAMP}
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
   <!-- 根据订单编号获得已交款 -->
@@ -643,7 +658,7 @@ where order_no= #{orderNo,jdbcType=VARCHAR};
       transaction_channel, remarks, confirm_sign, 
       delete_sign, financial_pay_no, financial_pay_time, 
       type)values 
-       <foreach item="item" index="index" collection="list" separator=",">
+       <foreach collection="list" index="index" item="item" separator=",">
       	(#{item.billNo,jdbcType=VARCHAR}, #{item.orderNo,jdbcType=VARCHAR}, #{item.creater,jdbcType=VARCHAR}, 
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.payeeId,jdbcType=VARCHAR}, 
       #{item.payerId,jdbcType=VARCHAR}, #{item.transactionAmount,jdbcType=DECIMAL}, #{item.transactionSubject,jdbcType=INTEGER}, 

+ 71 - 48
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -10,89 +10,94 @@ 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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
+	 */
+	private Date deleteTime;
 
 	/**
 	 * 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getBillNo() {
 		return billNo;
@@ -101,7 +106,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setBillNo(String billNo) {
 		this.billNo = billNo;
@@ -110,7 +115,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -119,7 +124,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -128,7 +133,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getCreater() {
 		return creater;
@@ -137,7 +142,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -146,7 +151,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -155,7 +160,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -164,7 +169,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -173,7 +178,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -182,7 +187,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getPayeeId() {
 		return payeeId;
@@ -191,7 +196,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setPayeeId(String payeeId) {
 		this.payeeId = payeeId;
@@ -200,7 +205,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getPayerId() {
 		return payerId;
@@ -209,7 +214,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setPayerId(String payerId) {
 		this.payerId = payerId;
@@ -218,7 +223,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public BigDecimal getTransactionAmount() {
 		return transactionAmount;
@@ -227,7 +232,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setTransactionAmount(BigDecimal transactionAmount) {
 		this.transactionAmount = transactionAmount;
@@ -236,7 +241,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Integer getTransactionSubject() {
 		return transactionSubject;
@@ -245,7 +250,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setTransactionSubject(Integer transactionSubject) {
 		this.transactionSubject = transactionSubject;
@@ -254,7 +259,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Integer getTransactionChannel() {
 		return transactionChannel;
@@ -263,7 +268,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setTransactionChannel(Integer transactionChannel) {
 		this.transactionChannel = transactionChannel;
@@ -272,7 +277,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -281,7 +286,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -290,7 +295,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Integer getConfirmSign() {
 		return confirmSign;
@@ -299,7 +304,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setConfirmSign(Integer confirmSign) {
 		this.confirmSign = confirmSign;
@@ -308,7 +313,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Byte getDeleteSign() {
 		return deleteSign;
@@ -317,7 +322,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setDeleteSign(Byte deleteSign) {
 		this.deleteSign = deleteSign;
@@ -326,7 +331,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getFinancialPayNo() {
 		return financialPayNo;
@@ -335,7 +340,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setFinancialPayNo(String financialPayNo) {
 		this.financialPayNo = financialPayNo;
@@ -344,7 +349,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Date getFinancialPayTime() {
 		return financialPayTime;
@@ -353,7 +358,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setFinancialPayTime(Date financialPayTime) {
 		this.financialPayTime = financialPayTime;
@@ -362,7 +367,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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -371,12 +376,30 @@ 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 Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 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 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
+	 */
+	public Date getDeleteTime() {
+		return deleteTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setDeleteTime(Date deleteTime) {
+		this.deleteTime = deleteTime;
+	}
+
 	private String financialPayTimes;
     private String payerName;
     private String payeeName;

+ 76 - 16
src/main/java/com/goafanti/common/model/TOrderBillNewExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderBillNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public TOrderBillNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderBillNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1193,11 +1193,71 @@ public class TOrderBillNewExample {
 			addCriterion("type not between", value1, value2, "type");
 			return (Criteria) this;
 		}
+
+		public Criteria andDeleteTimeIsNull() {
+			addCriterion("delete_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeIsNotNull() {
+			addCriterion("delete_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeEqualTo(Date value) {
+			addCriterion("delete_time =", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeNotEqualTo(Date value) {
+			addCriterion("delete_time <>", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeGreaterThan(Date value) {
+			addCriterion("delete_time >", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("delete_time >=", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeLessThan(Date value) {
+			addCriterion("delete_time <", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeLessThanOrEqualTo(Date value) {
+			addCriterion("delete_time <=", value, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeIn(List<Date> values) {
+			addCriterion("delete_time in", values, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeNotIn(List<Date> values) {
+			addCriterion("delete_time not in", values, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeBetween(Date value1, Date value2) {
+			addCriterion("delete_time between", value1, value2, "deleteTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteTimeNotBetween(Date value1, Date value2) {
+			addCriterion("delete_time not between", value1, value2, "deleteTime");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
+	 * @mbg.generated  Mon Feb 17 11:41:23 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,6 +89,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		TOrderBillNew ntbn=new TOrderBillNew();
 		ntbn.setBillNo(tbn.getBillNo());
 		ntbn.setDeleteSign((byte)1);
+		ntbn.setDeleteTime(new Date());
 		billNewMapper.updateByPrimaryKeySelective(ntbn);
 		return 1;
 	}