Browse Source

批量回收代码开发

anderx 6 years ago
parent
commit
269c924642

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

@@ -11,94 +11,72 @@ 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int countByExample(TOrderBillNewExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int deleteByExample(TOrderBillNewExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int deleteByPrimaryKey(String billNo);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int insert(TOrderBillNew record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int insertSelective(TOrderBillNew record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    List<TOrderBillNew> selectByExample(TOrderBillNewExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    TOrderBillNew selectByPrimaryKey(String billNo);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int updateByPrimaryKeySelective(TOrderBillNew record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_bill_new
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    int updateByPrimaryKey(TOrderBillNew record);
-    
-    BigDecimal getAmountByOid(String oid);
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	int updateByPrimaryKey(TOrderBillNew record);
+
+	BigDecimal getAmountByOid(String oid);
     
     TOrderBillNew getOneRefundFlow(String BillNo);
     
@@ -111,4 +89,6 @@ public interface TOrderBillNewMapper {
 	BigDecimal conutAmountByOrderNo(String orderNo);
 
 	List<BillBo> selectByOrderNo(String orderNo);
+
+	void insertBatch(List<TOrderBillNew> listBull);
 }

+ 60 - 76
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -7,94 +7,78 @@ import org.apache.ibatis.annotations.Param;
 
 public interface TemporaryReceivablesMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    long countByExample(TemporaryReceivablesExample example);
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	long countByExample(TemporaryReceivablesExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int deleteByExample(TemporaryReceivablesExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int deleteByExample(TemporaryReceivablesExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int insert(TemporaryReceivables record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int insert(TemporaryReceivables record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int insertSelective(TemporaryReceivables record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int insertSelective(TemporaryReceivables record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    List<TemporaryReceivables> selectByExample(TemporaryReceivablesExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	List<TemporaryReceivables> selectByExample(TemporaryReceivablesExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    TemporaryReceivables selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	TemporaryReceivables selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") TemporaryReceivables record, @Param("example") TemporaryReceivablesExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TemporaryReceivables record,
+			@Param("example") TemporaryReceivablesExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int updateByExample(@Param("record") TemporaryReceivables record, @Param("example") TemporaryReceivablesExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int updateByExample(@Param("record") TemporaryReceivables record,
+			@Param("example") TemporaryReceivablesExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int updateByPrimaryKeySelective(TemporaryReceivables record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TemporaryReceivables record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table temporary_receivables
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    int updateByPrimaryKey(TemporaryReceivables record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	int updateByPrimaryKey(TemporaryReceivables record);
 
 	int deleteByids(List<?> ids);
 
 	int deleteByaid(String aid);
+
+	List<TemporaryReceivables> selectByaid(String aid);
+
+	void deleteNormalByaid(String aid);
 }

+ 106 - 75
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.goafanti.common.dao.TOrderBillNewMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderBillNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     <id column="bill_no" jdbcType="VARCHAR" property="billNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -22,12 +22,13 @@
     <result column="delete_sign" jdbcType="TINYINT" property="deleteSign" />
     <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" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,9 +60,9 @@
   </sql>
   <sql id="Update_By_Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,19 +94,19 @@
   </sql>
   <sql id="Base_Column_List">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     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
+    financial_pay_time, type
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample" resultMap="BaseResultMap">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     select
     <if test="distinct">
@@ -122,9 +123,9 @@
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -133,18 +134,18 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     delete from t_order_bill_new
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     delete from t_order_bill_new
     <if test="_parameter != null">
@@ -153,28 +154,28 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TOrderBillNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     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
-      )
+      delete_sign, financial_pay_no, financial_pay_time, 
+      type)
     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}
-      )
+      #{deleteSign,jdbcType=TINYINT}, #{financialPayNo,jdbcType=VARCHAR}, #{financialPayTime,jdbcType=TIMESTAMP}, 
+      #{type,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderBillNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     insert into t_order_bill_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -223,6 +224,9 @@
       <if test="financialPayTime != null">
         financial_pay_time,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="billNo != null">
@@ -270,13 +274,16 @@
       <if test="financialPayTime != null">
         #{financialPayTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBillNewExample" resultType="java.lang.Long">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     select count(*) from t_order_bill_new
     <if test="_parameter != null">
@@ -285,9 +292,9 @@
   </select>
   <update id="updateByExampleSelective" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     update t_order_bill_new
     <set>
@@ -336,6 +343,9 @@
       <if test="record.financialPayTime != null">
         financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -343,9 +353,9 @@
   </update>
   <update id="updateByExample" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     update t_order_bill_new
     set bill_no = #{record.billNo,jdbcType=VARCHAR},
@@ -362,16 +372,17 @@
       confirm_sign = #{record.confirmSign,jdbcType=INTEGER},
       delete_sign = #{record.deleteSign,jdbcType=TINYINT},
       financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
-      financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP}
+      financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
+      type = #{record.type,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderBillNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     update t_order_bill_new
     <set>
@@ -417,14 +428,17 @@
       <if test="financialPayTime != null">
         financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderBillNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:14:40 CST 2018.
+      This element was generated on Mon Oct 14 09:49:04 CST 2019.
     -->
     update t_order_bill_new
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -440,7 +454,8 @@
       confirm_sign = #{confirmSign,jdbcType=INTEGER},
       delete_sign = #{deleteSign,jdbcType=TINYINT},
       financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
-      financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP}
+      financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
+      type = #{type,jdbcType=INTEGER}
     where bill_no = #{billNo,jdbcType=VARCHAR}
   </update>
   <!-- 根据订单编号获得已交款 -->
@@ -489,29 +504,29 @@
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign != 1 
-  	<if test='b.orderNo != null and b.orderNo != ""'>
+  	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.departmentId != null and b.departmentId != ""'>
+  	<if test="b.departmentId != null and b.departmentId != &quot;&quot;">
 	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
 	</if>
-  	<if test='b.creater != null and b.creater != ""'>
+  	<if test="b.creater != null and b.creater != &quot;&quot;">
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.payerName != null and b.payerName != ""'>
-  	<bind name="nn" value="'%' + b.payerName + '%'"/>
+  	<if test="b.payerName != null and b.payerName != &quot;&quot;">
+  	<bind name="nn" value="'%' + b.payerName + '%'" />
   	and u.nickname like #{nn,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.payeeName != null and b.payeeName != ""'>
-  	<bind name="n" value="'%' + b.payeeName + '%'"/>
+  	<if test="b.payeeName != null and b.payeeName != &quot;&quot;">
+  	<bind name="n" value="'%' + b.payeeName + '%'" />
   	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.departmentId != null and b.departmentId != "" '>
+  	<if test="b.departmentId != null and b.departmentId != &quot;&quot; ">
   	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.startTime != null and b.startTime != "" and b.endTime != null and b.endTime != ""'>
-  	<bind name="a" value="b.startTime + ' 00:00:00'"/>
-  	<bind name="e" value="b.endTime + ' 23:59:59'"/>
+  	<if test="b.startTime != null and b.startTime != &quot;&quot; and b.endTime != null and b.endTime != &quot;&quot;">
+  	<bind name="a" value="b.startTime + ' 00:00:00'" />
+  	<bind name="e" value="b.endTime + ' 23:59:59'" />
   	and b.create_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   	</if>
   	order by b.create_time desc
@@ -527,29 +542,29 @@
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign != 1 
-  	<if test='b.orderNo != null and b.orderNo != ""'>
+  	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.creater != null and b.creater != ""'>
+  	<if test="b.creater != null and b.creater != &quot;&quot;">
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.departmentId != null and b.departmentId != ""'>
+  	<if test="b.departmentId != null and b.departmentId != &quot;&quot;">
 	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
 	</if>
-  	<if test='b.payerName != null and b.payerName != ""'>
-  	<bind name="nn" value="'%' + b.payerName + '%'"/>
+  	<if test="b.payerName != null and b.payerName != &quot;&quot;">
+  	<bind name="nn" value="'%' + b.payerName + '%'" />
   	and u.nickname like #{nn,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.payeeName != null and b.payeeName != ""'>
-  	<bind name="n" value="'%' + b.payeeName + '%'"/>
+  	<if test="b.payeeName != null and b.payeeName != &quot;&quot;">
+  	<bind name="n" value="'%' + b.payeeName + '%'" />
   	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.departmentId != null and b.departmentId != "" '>
+  	<if test="b.departmentId != null and b.departmentId != &quot;&quot; ">
   	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
   	</if>
-  	<if test='b.startTime != null and b.startTime != "" and b.endTime != null and b.endTime != ""'>
-  	<bind name="a" value="b.startTime + ' 00:00:00'"/>
-  	<bind name="e" value="b.endTime + ' 23:59:59'"/>
+  	<if test="b.startTime != null and b.startTime != &quot;&quot; and b.endTime != null and b.endTime != &quot;&quot;">
+  	<bind name="a" value="b.startTime + ' 00:00:00'" />
+  	<bind name="e" value="b.endTime + ' 23:59:59'" />
   	and b.create_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   	</if>
   </select>
@@ -565,17 +580,17 @@
 	  	left join department d on oa.department_id = d.id
 	  	where 
 	  	b.delete_sign = 0 
-	  	<if test='payerName != null and payerName != ""'>
-	  	<bind name="nn" value="'%' + payerName + '%'"/>
+	  	<if test="payerName != null and payerName != &quot;&quot;">
+	  	<bind name="nn" value="'%' + payerName + '%'" />
 	  	and u.nickname like #{nn,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='payeeName != null and payeeName != ""'>
-	  	<bind name="n" value="'%' + payeeName + '%'"/>
+	  	<if test="payeeName != null and payeeName != &quot;&quot;">
+	  	<bind name="n" value="'%' + payeeName + '%'" />
 	  	and a.nickname like #{n,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='startTime != null and startTime != "" and endTime != null and endTime != ""'>
-	  	<bind name="a" value="startTime + ' 00:00:00'"/>
-	  	<bind name="e" value="endTime + ' 23:59:59'"/>
+	  	<if test="startTime != null and startTime != &quot;&quot; and endTime != null and endTime != &quot;&quot;">
+	  	<bind name="a" value="startTime + ' 00:00:00'" />
+	  	<bind name="e" value="endTime + ' 23:59:59'" />
 	  	and b.create_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	  	</if>
   </select>
@@ -594,20 +609,20 @@
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign = 0 
-  	<if test='payerName != null and payerName != ""'>
-  	<bind name="nn" value="'%' + payerName + '%'"/>
+  	<if test="payerName != null and payerName != &quot;&quot;">
+  	<bind name="nn" value="'%' + payerName + '%'" />
   	and u.nickname like #{nn,jdbcType=VARCHAR}
   	</if>
-  	<if test='payeeName != null and payeeName != ""'>
-  	<bind name="n" value="'%' + payeeName + '%'"/>
+  	<if test="payeeName != null and payeeName != &quot;&quot;">
+  	<bind name="n" value="'%' + payeeName + '%'" />
   	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='departmentId != null and departmentId != "" '>
+  	<if test="departmentId != null and departmentId != &quot;&quot; ">
   	and oa.department_id = #{departmentId,jdbcType=VARCHAR}
   	</if>
-  	<if test='startTime != null and startTime != "" and endTime != null and endTime != ""'>
-  	<bind name="a" value="startTime + ' 00:00:00'"/>
-  	<bind name="e" value="endTime + ' 23:59:59'"/>
+  	<if test="startTime != null and startTime != &quot;&quot; and endTime != null and endTime != &quot;&quot;">
+  	<bind name="a" value="startTime + ' 00:00:00'" />
+  	<bind name="e" value="endTime + ' 23:59:59'" />
   	and b.create_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   	</if>
   	order by b.order_no, b.creater , b.financial_pay_time
@@ -621,4 +636,20 @@ where  a.order_no= #{orderNo,jdbcType=VARCHAR};
 left join admin b on a.creater=b.id
 where order_no= #{orderNo,jdbcType=VARCHAR};	
  </select>
+ <insert id="insertBatch" parameterType="com.goafanti.common.model.TOrderBillNew">
+    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)values 
+       <foreach item="item" index="index" collection="list" 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}, 
+      #{item.transactionChannel,jdbcType=INTEGER}, #{item.remarks,jdbcType=VARCHAR}, #{item.confirmSign,jdbcType=INTEGER}, 
+      #{item.deleteSign,jdbcType=TINYINT}, #{item.financialPayNo,jdbcType=VARCHAR}, #{item.financialPayTime,jdbcType=TIMESTAMP}, 
+      #{item.type,jdbcType=INTEGER})
+    </foreach>
+  </insert>
 </mapper>

+ 88 - 23
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -16,12 +16,13 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="financial_pay_no" jdbcType="VARCHAR" property="financialPayNo" />
   </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 Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,15 +90,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
-    id, order_no, corporate_name, amount, receivables_time, aid, remarks, status, create_time
+    id, order_no, corporate_name, amount, receivables_time, aid, remarks, status, create_time, 
+    financial_pay_no
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     select
     <if test="distinct">
@@ -116,7 +118,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -127,7 +129,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     delete from temporary_receivables
     where id = #{id,jdbcType=INTEGER}
@@ -136,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     delete from temporary_receivables
     <if test="_parameter != null">
@@ -147,22 +149,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     insert into temporary_receivables (id, order_no, corporate_name, 
       amount, receivables_time, aid, 
-      remarks, status, create_time
-      )
+      remarks, status, create_time, 
+      financial_pay_no)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{corporateName,jdbcType=VARCHAR}, 
       #{amount,jdbcType=DECIMAL}, #{receivablesTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{financialPayNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TemporaryReceivables">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     insert into temporary_receivables
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -193,6 +195,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="financialPayNo != null">
+        financial_pay_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -222,13 +227,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="financialPayNo != null">
+        #{financialPayNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     select count(*) from temporary_receivables
     <if test="_parameter != null">
@@ -239,7 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     update temporary_receivables
     <set>
@@ -270,6 +278,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.financialPayNo != null">
+        financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -279,7 +290,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     update temporary_receivables
     set id = #{record.id,jdbcType=INTEGER},
@@ -290,7 +301,8 @@
       aid = #{record.aid,jdbcType=VARCHAR},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -299,7 +311,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     update temporary_receivables
     <set>
@@ -327,6 +339,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="financialPayNo != null">
+        financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -334,7 +349,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 11 11:14:15 CST 2019.
+      This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     update temporary_receivables
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -344,14 +359,15 @@
       aid = #{aid,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      financial_pay_no = #{financialPayNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
    <delete id="deleteByids" parameterType="java.util.List">
     delete from temporary_receivables
     where id in 
-	 <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   
+	 <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">   
             #{item}   
          </foreach>
   </delete>
@@ -359,4 +375,53 @@
     delete from temporary_receivables
     where aid = #{aid} 
   </delete>
+  <delete id="deleteNormalByaid">
+  delete from temporary_receivables
+    where aid = #{aid} and status !=2
+  </delete>
+  <select id="selectByaid" resultMap="BaseResultMap">
+  
+    select 
+    <include refid="Base_Column_List" />
+    from temporary_receivables
+    where aid = #{aid,jdbcType=INTEGER}
+  </select>
+  <select id="selectReceivablesList" parameterType="java.lang.String" resultType="com.goafanti.order.bo.ReceivablesListBo">
+  	select a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,b.total_amount totalAmount,d.name depName,a.status ,
+	a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks
+	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
+	where 1=1
+	<if test="contractNo != null">
+	b.contract_no like concat('%',#{contractNo},'%')
+	</if> 
+	<if test="orderNo != null">
+	and a.order_no like concat('%',#{orderNo},'%')
+	</if>
+	<if test="nickname != null">
+	and c.nickname like concat('%',#{nickname},'%')
+	</if>
+	<if test="depId != null">
+	and b.order_dep= #{depId}
+	</if>
+	order by b.contract_no,a.create_time desc
+	<if test="page_sql!=null">
+	${page_sql}
+	</if>
+  </select>
+  <select id="selectReceivablesCount"  resultType="java.lang.Integer">
+  	select count(*) from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
+	where 1=1
+	<if test="contractNo != null">
+	b.contract_no like concat('%',#{contractNo},'%')
+	</if> 
+	<if test="orderNo != null">
+	and a.order_no like concat('%',#{orderNo},'%')
+	</if>
+	<if test="nickname != null">
+	and c.nickname like concat('%',#{nickname},'%')
+	</if>
+	<if test="depId != null">
+	and b.order_dep= #{depId}
+	</if>
+  </select>
 </mapper>

+ 349 - 475
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -9,513 +9,387 @@ 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String billNo;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.order_no
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String orderNo;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.creater
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String creater;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.create_time
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.update_time
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Date updateTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.payee_id
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String payeeId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.payer_id
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String payerId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.transaction_amount
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private BigDecimal transactionAmount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.transaction_subject
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Integer transactionSubject;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.transaction_channel
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Integer transactionChannel;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.remarks
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String remarks;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.confirm_sign
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Integer confirmSign;
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private Integer type;
+
+	/**
+	 * 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
+	 */
+	public String getBillNo() {
+		return billNo;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.delete_sign
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Byte deleteSign;
+	/**
+	 * 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
+	 */
+	public void setBillNo(String billNo) {
+		this.billNo = billNo;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.financial_pay_no
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private String financialPayNo;
+	/**
+	 * 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
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_bill_new.financial_pay_time
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    private Date financialPayTime;
-
-    private String financialPayTimes;
-    private String payerName;
-    private String payeeName;
-    private String createrName;
-    private String startTime;
-    private String endTime;
-    private String departmentId;
-    private String saleId;
-    private String saleName;
-    private String departmentName;
-    private String createTimes;
-    
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getBillNo() {
-        return billNo;
-    }
+	/**
+	 * 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
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setBillNo(String billNo) {
-        this.billNo = billNo;
-    }
+	/**
+	 * 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
+	 */
+	public String getCreater() {
+		return creater;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
+	/**
+	 * 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
+	 */
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getCreater() {
-        return creater;
-    }
+	/**
+	 * 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
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setCreater(String creater) {
-        this.creater = creater;
-    }
+	/**
+	 * 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
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
+	/**
+	 * 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
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * 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
+	 */
+	public String getPayeeId() {
+		return payeeId;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
+	/**
+	 * 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
+	 */
+	public void setPayeeId(String payeeId) {
+		this.payeeId = payeeId;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
+	/**
+	 * 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
+	 */
+	public String getPayerId() {
+		return payerId;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getPayeeId() {
-        return payeeId;
-    }
+	/**
+	 * 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
+	 */
+	public void setPayerId(String payerId) {
+		this.payerId = payerId;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setPayeeId(String payeeId) {
-        this.payeeId = payeeId;
-    }
+	/**
+	 * 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
+	 */
+	public BigDecimal getTransactionAmount() {
+		return transactionAmount;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getPayerId() {
-        return payerId;
-    }
+	/**
+	 * 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
+	 */
+	public void setTransactionAmount(BigDecimal transactionAmount) {
+		this.transactionAmount = transactionAmount;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setPayerId(String payerId) {
-        this.payerId = payerId;
-    }
+	/**
+	 * 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
+	 */
+	public Integer getTransactionSubject() {
+		return transactionSubject;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public BigDecimal getTransactionAmount() {
-        return transactionAmount;
-    }
+	/**
+	 * 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
+	 */
+	public void setTransactionSubject(Integer transactionSubject) {
+		this.transactionSubject = transactionSubject;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setTransactionAmount(BigDecimal transactionAmount) {
-        this.transactionAmount = transactionAmount;
-    }
+	/**
+	 * 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
+	 */
+	public Integer getTransactionChannel() {
+		return transactionChannel;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Integer getTransactionSubject() {
-        return transactionSubject;
-    }
+	/**
+	 * 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
+	 */
+	public void setTransactionChannel(Integer transactionChannel) {
+		this.transactionChannel = transactionChannel;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setTransactionSubject(Integer transactionSubject) {
-        this.transactionSubject = transactionSubject;
-    }
+	/**
+	 * 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
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Integer getTransactionChannel() {
-        return transactionChannel;
-    }
+	/**
+	 * 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
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setTransactionChannel(Integer transactionChannel) {
-        this.transactionChannel = transactionChannel;
-    }
+	/**
+	 * 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
+	 */
+	public Integer getConfirmSign() {
+		return confirmSign;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getRemarks() {
-        return remarks;
-    }
+	/**
+	 * 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
+	 */
+	public void setConfirmSign(Integer confirmSign) {
+		this.confirmSign = confirmSign;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
+	/**
+	 * 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
+	 */
+	public Byte getDeleteSign() {
+		return deleteSign;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Integer getConfirmSign() {
-        return confirmSign;
-    }
+	/**
+	 * 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
+	 */
+	public void setDeleteSign(Byte deleteSign) {
+		this.deleteSign = deleteSign;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setConfirmSign(Integer confirmSign) {
-        this.confirmSign = confirmSign;
-    }
+	/**
+	 * 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
+	 */
+	public String getFinancialPayNo() {
+		return financialPayNo;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Byte getDeleteSign() {
-        return deleteSign;
-    }
+	/**
+	 * 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
+	 */
+	public void setFinancialPayNo(String financialPayNo) {
+		this.financialPayNo = financialPayNo;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setDeleteSign(Byte deleteSign) {
-        this.deleteSign = deleteSign;
-    }
+	/**
+	 * 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
+	 */
+	public Date getFinancialPayTime() {
+		return financialPayTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public String getFinancialPayNo() {
-        return financialPayNo;
-    }
+	/**
+	 * 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
+	 */
+	public void setFinancialPayTime(Date financialPayTime) {
+		this.financialPayTime = financialPayTime;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setFinancialPayNo(String financialPayNo) {
-        this.financialPayNo = financialPayNo;
-    }
+	/**
+	 * 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
+	 */
+	public Integer getType() {
+		return type;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public Date getFinancialPayTime() {
-        return financialPayTime;
-    }
+	/**
+	 * 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
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
 
-    /**
-     * 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
-     *
-     * @mbggenerated Tue Nov 20 11:14:40 CST 2018
-     */
-    public void setFinancialPayTime(Date financialPayTime) {
-        this.financialPayTime = financialPayTime;
-    }
-
-	public String getFinancialPayTimes() {
+	private String financialPayTimes;
+    private String payerName;
+    private String payeeName;
+    private String createrName;
+    private String startTime;
+    private String endTime;
+    private String departmentId;
+    private String saleId;
+    private String saleName;
+    private String departmentName;
+    private String createTimes;
+    
+    public String getFinancialPayTimes() {
 		return financialPayTimes;
 	}
 

File diff suppressed because it is too large
+ 1272 - 1253
src/main/java/com/goafanti/common/model/TOrderBillNewExample.java


+ 230 - 295
src/main/java/com/goafanti/common/model/TemporaryReceivables.java

@@ -4,300 +4,235 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class TemporaryReceivables {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.id
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.order_no
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private String orderNo;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.corporate_name
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private String corporateName;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.amount
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private BigDecimal amount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.receivables_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private Date receivablesTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.aid
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private String aid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.remarks
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private String remarks;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.status
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private Integer status;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column temporary_receivables.create_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.id
-     *
-     * @return the value of temporary_receivables.id
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.id
-     *
-     * @param id the value for temporary_receivables.id
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.order_no
-     *
-     * @return the value of temporary_receivables.order_no
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.order_no
-     *
-     * @param orderNo the value for temporary_receivables.order_no
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.corporate_name
-     *
-     * @return the value of temporary_receivables.corporate_name
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public String getCorporateName() {
-        return corporateName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.corporate_name
-     *
-     * @param corporateName the value for temporary_receivables.corporate_name
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setCorporateName(String corporateName) {
-        this.corporateName = corporateName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.amount
-     *
-     * @return the value of temporary_receivables.amount
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.amount
-     *
-     * @param amount the value for temporary_receivables.amount
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.receivables_time
-     *
-     * @return the value of temporary_receivables.receivables_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public Date getReceivablesTime() {
-        return receivablesTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.receivables_time
-     *
-     * @param receivablesTime the value for temporary_receivables.receivables_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setReceivablesTime(Date receivablesTime) {
-        this.receivablesTime = receivablesTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.aid
-     *
-     * @return the value of temporary_receivables.aid
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public String getAid() {
-        return aid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.aid
-     *
-     * @param aid the value for temporary_receivables.aid
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.remarks
-     *
-     * @return the value of temporary_receivables.remarks
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public String getRemarks() {
-        return remarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.remarks
-     *
-     * @param remarks the value for temporary_receivables.remarks
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.status
-     *
-     * @return the value of temporary_receivables.status
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.status
-     *
-     * @param status the value for temporary_receivables.status
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column temporary_receivables.create_time
-     *
-     * @return the value of temporary_receivables.create_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column temporary_receivables.create_time
-     *
-     * @param createTime the value for temporary_receivables.create_time
-     *
-     * @mbg.generated Fri Oct 11 11:14:15 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.id
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.order_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.corporate_name
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private String corporateName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.amount
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private BigDecimal amount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.receivables_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private Date receivablesTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.aid
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.remarks
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.status
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.create_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.financial_pay_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	private String financialPayNo;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.id
+	 * @return  the value of temporary_receivables.id
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.id
+	 * @param id  the value for temporary_receivables.id
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.order_no
+	 * @return  the value of temporary_receivables.order_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.order_no
+	 * @param orderNo  the value for temporary_receivables.order_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.corporate_name
+	 * @return  the value of temporary_receivables.corporate_name
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public String getCorporateName() {
+		return corporateName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.corporate_name
+	 * @param corporateName  the value for temporary_receivables.corporate_name
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setCorporateName(String corporateName) {
+		this.corporateName = corporateName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.amount
+	 * @return  the value of temporary_receivables.amount
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.amount
+	 * @param amount  the value for temporary_receivables.amount
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.receivables_time
+	 * @return  the value of temporary_receivables.receivables_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public Date getReceivablesTime() {
+		return receivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.receivables_time
+	 * @param receivablesTime  the value for temporary_receivables.receivables_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setReceivablesTime(Date receivablesTime) {
+		this.receivablesTime = receivablesTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.aid
+	 * @return  the value of temporary_receivables.aid
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.aid
+	 * @param aid  the value for temporary_receivables.aid
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.remarks
+	 * @return  the value of temporary_receivables.remarks
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.remarks
+	 * @param remarks  the value for temporary_receivables.remarks
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.status
+	 * @return  the value of temporary_receivables.status
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.status
+	 * @param status  the value for temporary_receivables.status
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.create_time
+	 * @return  the value of temporary_receivables.create_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.create_time
+	 * @param createTime  the value for temporary_receivables.create_time
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.financial_pay_no
+	 * @return  the value of temporary_receivables.financial_pay_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public String getFinancialPayNo() {
+		return financialPayNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.financial_pay_no
+	 * @param financialPayNo  the value for temporary_receivables.financial_pay_no
+	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
+	 */
+	public void setFinancialPayNo(String financialPayNo) {
+		this.financialPayNo = financialPayNo;
+	}
 }

File diff suppressed because it is too large
+ 892 - 863
src/main/java/com/goafanti/common/model/TemporaryReceivablesExample.java


+ 77 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -0,0 +1,77 @@
+package com.goafanti.order.bo;
+
+public class ReceivablesListBo {
+	private String orderNo;
+	private String contractNo;
+	private String corporateName;
+	private String nickname;
+	private String totalAmount;
+	private String depName;
+	private String statusamount;
+	private String receivablesTimes;
+	private String createTimes;
+	private String remarks;
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getCorporateName() {
+		return corporateName;
+	}
+	public void setCorporateName(String corporateName) {
+		this.corporateName = corporateName;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public String getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(String totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getStatusamount() {
+		return statusamount;
+	}
+	public void setStatusamount(String statusamount) {
+		this.statusamount = statusamount;
+	}
+	public String getReceivablesTimes() {
+		return receivablesTimes;
+	}
+	public void setReceivablesTimes(String receivablesTimes) {
+		this.receivablesTimes = receivablesTimes;
+	}
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	
+	
+
+}

+ 20 - 2
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -7,7 +7,6 @@ package com.goafanti.order.controller;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.model.TemporaryReceivables;
+import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.service.OrderReceivablesService;
 
@@ -91,4 +90,23 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 		}
 		return res;
 	}
+	
+	@RequestMapping(value ="/listReceivables",method = RequestMethod.GET)
+	public Result listReceivables(String contractNo,String orderNo,String nickname,String depId,Integer pageSize,Integer pageNo){
+		Result res = new Result();
+		res.data(orderReceivablesService.listReceivables( contractNo, orderNo, nickname, depId, pageSize, pageNo));
+		return res;
+	}
+	/**
+	 * 	处理批量导入
+	 * 
+	 * 
+	 */
+	@RequestMapping(value ="/batchImport",method = RequestMethod.POST)
+	public Result batchImport(){
+		LoggerUtils.debug(getClass(), "=========================开始批量导入===================");
+		Result res = new Result();
+		res.data(orderReceivablesService.batchImport());
+		return res;
+	}
 }

+ 2 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -118,7 +118,8 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 财务专员新增流水记录并流转订单状态
+	 * 	财务收款
+	 * 	财务专员新增流水记录并流转订单状态
 	 * @param billNew
 	 * @return
 	 */

+ 6 - 0
src/main/java/com/goafanti/order/service/OrderReceivablesService.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.service;
 
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.ReceivablesListBo;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 
 public interface OrderReceivablesService {
@@ -12,4 +14,8 @@ public interface OrderReceivablesService {
 
 	int deleteAllReceivables();
 
+	int batchImport();
+
+	Pagination<ReceivablesListBo>  listReceivables(String contractNo, String orderNo, String nickname, String depId,Integer pageSize,Integer pageNo);
+
 }

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

@@ -280,7 +280,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
 		TOrderNew orderNew = new TOrderNew();
 		orderNew.setOrderNo(billNew.getOrderNo());
-		orderNew.setContractNo(contractNo);
+		if(contractNo!=null)orderNew.setContractNo(contractNo);
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);

+ 178 - 0
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -1,26 +1,62 @@
 package com.goafanti.order.service.impl;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.TOrderBillNewMapper;
+import com.goafanti.common.dao.TOrderBonusMapper;
+import com.goafanti.common.dao.TOrderLogMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TemporaryReceivablesMapper;
+import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.TOrderBillNew;
+import com.goafanti.common.model.TOrderBonus;
+import com.goafanti.common.model.TOrderLog;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.TemporaryReceivables;
 import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.ReceivablesListBo;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
+import com.goafanti.order.enums.BonusSubject;
+import com.goafanti.order.enums.LiquidationNewState;
+import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderReceivablesService;
+
 @Service
 public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceivablesMapper> implements OrderReceivablesService{
 
 	@Autowired
 	private TemporaryReceivablesMapper	temporaryReceivablesMapper;
+	@Autowired
+	private TOrderBillNewMapper	tOrderBillNewMapper;
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
+	@Autowired
+	private TOrderBonusMapper tOrderBonusMapper;
+	@Autowired
+	private TOrderLogMapper	tOrderLogMapper;
+	@Autowired
+	private TOrderTaskMapper tOrderTaskMapper;
+	
 	@Override
 	public int addReceivables(TemporaryReceivablesBo t) {
 		t.setAid(TokenManager.getAdminId());
@@ -60,5 +96,147 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	public int deleteAllReceivables() {
 		return temporaryReceivablesMapper.deleteByaid(TokenManager.getAdminId());
 	}
+	@Override
+	public int batchImport() {
+		List<TemporaryReceivables> list=temporaryReceivablesMapper.selectByaid(TokenManager.getAdminId());
+		if(list.size()>99)throw new BusinessException(new Error("数量过大,建议不超过99。"));
+		List<TOrderBillNew> listBull=new ArrayList<>();
+		for (TemporaryReceivables tr : list) {
+			TOrderBillNew tbn=new TOrderBillNew(); 
+			//获取已收款
+			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
+			//获取总金额
+			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
+			//计算收款结果
+			BigDecimal bd = bill.add(tr.getAmount().abs());
+			
+			TOrderBonus bonus = new TOrderBonus();
+			bonus.setId(UUID.randomUUID().toString());
+			bonus.setOrderNo(tr.getOrderNo());
+			bonus.setGrantBy(TokenManager.getAdminId());
+			int lstaus = 0;//如果订单流水小于首付 lstaus 0
+			if(bd.compareTo(t.getTotalAmount()) == 1){//如果订单流水总额大于总金额 return -1
+				tr.setStatus(2);
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}else if (bd.compareTo(t.getTotalAmount()) == 0) {//等于总额
+				//付完款//如果订单流水等于于总金额 lstaus 2
+				lstaus = 2;
+				bonus.setBonusSubject(BonusSubject.WK.getCode());//12
+				//发放给技术员如果付完款所有参与这个项目任务的人都会有结算奖
+				//获得所有的任务负责人
+				List<TOrderTask> l = tOrderTaskMapper.getReceiverByOid(tr.getOrderNo());
+				for (TOrderTask tOrderTask : l) {
+					if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
+						bonus.setTaskId(tOrderTask.getId());//任务id
+						bonus.setGrantTarget(tOrderTask.getTaskReceiver());
+						bonus.setGrantType(1);
+						int c = tOrderBonusMapper.checkByOnoAndSub(bonus);
+						//不存在就设置
+						if(c==0){
+							bonus.setId(UUID.randomUUID().toString());
+							tOrderBonusMapper.insertSelective(bonus);
+						}
+					}
+				}
+				if(tr.getStatus()==2) {
+					tr.setStatus(0);
+					temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				}
+				addOrderLog(tr.getOrderNo(), OrderLogProcess.CWQK.getCode());	
+			}else if (bd.compareTo(t.getTotalAmount()) == -1) {//小于总额
+				//如果订单流水小于总金额
+				if(bd.compareTo(t.getFirstAmount()) == 0 || bd.compareTo(t.getFirstAmount()) == 1){//首付完成
+					//查看首付奖是否存在
+					TOrderBonus b = new TOrderBonus();
+					b.setOrderNo(tr.getOrderNo());
+					b.setBonusSubject(11);
+					b.setGrantType(0);
+					b.setGrantTarget(t.getSalesmanId());
+					int c = tOrderBonusMapper.checkByOnoAndSub(b);
+					//不存在就设置
+					if(c==0){
+						bonus.setBonusSubject(BonusSubject.SF.getCode());//11
+					}
+					lstaus = 1;
+					if(tr.getStatus()==2) {
+						tr.setStatus(0);
+						temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+					}
+					addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
+				}
+			
+			}
+			//否则新增流水信息
+			tbn.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
+			tbn.setCreater(TokenManager.getAdminId());
+			tbn.setType(1);//批量
+			tbn.setOrderNo(t.getOrderNo());
+			tbn.setCreateTime(new Date());
+			tbn.setPayeeId("0");//默认设置0
+			tbn.setPayerId(t.getBuyerId());
+			tbn.setTransactionSubject(0);
+			tbn.setTransactionChannel(2);
+			tbn.setConfirmSign(0);
+			tbn.setTransactionAmount(tr.getAmount());
+			tbn.setDeleteSign((new Byte("0")));
+			tbn.setFinancialPayTime(tr.getReceivablesTime());
+			tbn.setFinancialPayNo(tr.getFinancialPayNo());
+			//修改订单结算金额和结算状态
+			//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
+			TOrderNew orderNew = new TOrderNew();
+			orderNew.setOrderNo(tr.getOrderNo());
+			//这里的已收金额是以前收的所有金额加上本次收的金额
+			orderNew.setSettlementAmount(bd);
+			orderNew.setLiquidationStatus(lstaus);
+			if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
+					|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
+						&& t.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
+				//流程状态是3,结算是付款的话
+				orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
+			}
+			tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+				//如果达到奖金发放要求新增奖金信息
+				if(null != bonus.getBonusSubject()){
+					bonus.setId(UUID.randomUUID().toString());
+					bonus.setGrantTarget(t.getSalesmanId());
+					//设置发放人类型
+					bonus.setGrantType(0);
+					tOrderBonusMapper.insertSelective(bonus);
+			}
+				
+				listBull.add(tbn);
+		}
+		if(!listBull.isEmpty()) {
+			tOrderBillNewMapper.insertBatch(listBull);
+			temporaryReceivablesMapper.deleteNormalByaid(TokenManager.getAdminId());
+		}else {
+			throw new BusinessException(new Error("未找到正确的回款信息。"));
+		}
+			
+		LoggerUtils.debug(getClass(), "=========================批量导入结束===================");
+		return 1;
+	}
+	private void addOrderLog(String orderNo, Integer code) {
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
+		tl.setProcess(code);
+		tl.setAid(TokenManager.getAdminId());
+		tOrderLogMapper.insertSelective(tl);
+		
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ReceivablesListBo> listReceivables(String contractNo, String orderNo, String nickname,
+			String depId,Integer pageSize,Integer pageNo) {
+		Map<String,Object> map=new HashMap<String, Object>();
+		if(pageSize==null||pageSize<1)pageSize=10;
+		if(pageNo==null||pageNo<1)pageNo=1;
+		if(StringUtils.isNotBlank(contractNo))map.put("contractNo", contractNo);
+		if(StringUtils.isNotBlank(orderNo))map.put("orderNo", orderNo);
+		if(StringUtils.isNotBlank(nickname))map.put("nickname", nickname);
+		if(StringUtils.isNotBlank(depId))map.put("depId", depId);
+		return (Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", map, pageNo, pageSize);
+	}
 
 }