Browse Source

订单管理

wanghui 8 years ago
parent
commit
1d4f9f2f3a

+ 1 - 1
GeneratorConfig.xml

@@ -10,6 +10,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="t_order"/>
+    <table schema="aft" tableName="t_order_bill"/>
   </context>
 </generatorConfiguration>

+ 31 - 7
src/main/java/com/goafanti/common/dao/TOrderBillMapper.java

@@ -9,43 +9,67 @@ public interface TOrderBillMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	long countByExample(TOrderBillExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	int deleteByExample(TOrderBillExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	int deleteByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	int insert(TOrderBill record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	int insertSelective(TOrderBill record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	List<TOrderBill> selectByExample(TOrderBillExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	TOrderBill selectByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") TOrderBill record, @Param("example") TOrderBillExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	int updateByExample(@Param("record") TOrderBill record, @Param("example") TOrderBillExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	int updateByPrimaryKeySelective(TOrderBill record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	int updateByPrimaryKey(TOrderBill record);
 }

+ 8 - 0
src/main/java/com/goafanti/common/dao/TOrderMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.common.model.TOrderExample;
+import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 
@@ -117,4 +118,11 @@ public interface TOrderMapper {
 	 */
 	ServiceOrderDetailBo selectServiceOrderDetail(String orderNo);
 
+	/**
+	 * 查询流水详情
+	 * @param billNo
+	 * @return
+	 */
+	BillDetailBo selectBillDetail(String billNo);
+
 }

+ 148 - 16
src/main/java/com/goafanti/common/mapper/TOrderBillMapper.xml

@@ -5,9 +5,9 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
-    <result column="bill_no" jdbcType="VARCHAR" property="billNo" />
+    <id column="bill_no" jdbcType="VARCHAR" property="billNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -23,12 +23,14 @@
     <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
     <result column="financial_pay_no" jdbcType="VARCHAR" property="financialPayNo" />
     <result column="financial_pay_time" jdbcType="TIMESTAMP" property="financialPayTime" />
+    <result column="confirm_time" jdbcType="TIMESTAMP" property="confirmTime" />
+    <result column="postscript" jdbcType="VARCHAR" property="postscript" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,17 +98,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     bill_no, order_no, creater, create_time, update_time, payee_id, payer_id, transaction_amount, 
     transaction_subject, transaction_channel, transaction_mode, remarks, confirm_sign, 
-    delete_sign, financial_pay_no, financial_pay_time
+    delete_sign, financial_pay_no, financial_pay_time, confirm_time, postscript
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderBillExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     select
     <if test="distinct">
@@ -121,11 +123,31 @@
       order by ${orderByClause}
     </if>
   </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_bill
+    where bill_no = #{billNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
+    -->
+    delete from t_order_bill
+    where bill_no = #{billNo,jdbcType=VARCHAR}
+  </delete>
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderBillExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     delete from t_order_bill
     <if test="_parameter != null">
@@ -136,26 +158,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     insert into t_order_bill (bill_no, order_no, creater, 
       create_time, update_time, payee_id, 
       payer_id, transaction_amount, transaction_subject, 
       transaction_channel, transaction_mode, remarks, 
       confirm_sign, delete_sign, financial_pay_no, 
-      financial_pay_time)
+      financial_pay_time, confirm_time, postscript
+      )
     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}, #{transactionMode,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, 
       #{confirmSign,jdbcType=INTEGER}, #{deleteSign,jdbcType=BIT}, #{financialPayNo,jdbcType=VARCHAR}, 
-      #{financialPayTime,jdbcType=TIMESTAMP})
+      #{financialPayTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP}, #{postscript,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderBill">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     insert into t_order_bill
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -207,6 +231,12 @@
       <if test="financialPayTime != null">
         financial_pay_time,
       </if>
+      <if test="confirmTime != null">
+        confirm_time,
+      </if>
+      <if test="postscript != null">
+        postscript,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="billNo != null">
@@ -257,13 +287,19 @@
       <if test="financialPayTime != null">
         #{financialPayTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="confirmTime != null">
+        #{confirmTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="postscript != null">
+        #{postscript,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBillExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     select count(*) from t_order_bill
     <if test="_parameter != null">
@@ -274,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     update t_order_bill
     <set>
@@ -326,6 +362,12 @@
       <if test="record.financialPayTime != null">
         financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.confirmTime != null">
+        confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.postscript != null">
+        postscript = #{record.postscript,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -335,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 17 16:45:46 CST 2018.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
     -->
     update t_order_bill
     set bill_no = #{record.billNo,jdbcType=VARCHAR},
@@ -353,9 +395,99 @@
       confirm_sign = #{record.confirmSign,jdbcType=INTEGER},
       delete_sign = #{record.deleteSign,jdbcType=BIT},
       financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
-      financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP}
+      financial_pay_time = #{record.financialPayTime,jdbcType=TIMESTAMP},
+      confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
+      postscript = #{record.postscript,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderBill">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
+    -->
+    update t_order_bill
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="payeeId != null">
+        payee_id = #{payeeId,jdbcType=VARCHAR},
+      </if>
+      <if test="payerId != null">
+        payer_id = #{payerId,jdbcType=VARCHAR},
+      </if>
+      <if test="transactionAmount != null">
+        transaction_amount = #{transactionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="transactionSubject != null">
+        transaction_subject = #{transactionSubject,jdbcType=INTEGER},
+      </if>
+      <if test="transactionChannel != null">
+        transaction_channel = #{transactionChannel,jdbcType=INTEGER},
+      </if>
+      <if test="transactionMode != null">
+        transaction_mode = #{transactionMode,jdbcType=INTEGER},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="confirmSign != null">
+        confirm_sign = #{confirmSign,jdbcType=INTEGER},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=BIT},
+      </if>
+      <if test="financialPayNo != null">
+        financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="financialPayTime != null">
+        financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="confirmTime != null">
+        confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="postscript != null">
+        postscript = #{postscript,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where bill_no = #{billNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderBill">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jan 24 10:59:50 CST 2018.
+    -->
+    update t_order_bill
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      payee_id = #{payeeId,jdbcType=VARCHAR},
+      payer_id = #{payerId,jdbcType=VARCHAR},
+      transaction_amount = #{transactionAmount,jdbcType=DECIMAL},
+      transaction_subject = #{transactionSubject,jdbcType=INTEGER},
+      transaction_channel = #{transactionChannel,jdbcType=INTEGER},
+      transaction_mode = #{transactionMode,jdbcType=INTEGER},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      confirm_sign = #{confirmSign,jdbcType=INTEGER},
+      delete_sign = #{deleteSign,jdbcType=BIT},
+      financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
+      financial_pay_time = #{financialPayTime,jdbcType=TIMESTAMP},
+      confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
+      postscript = #{postscript,jdbcType=VARCHAR}
+    where bill_no = #{billNo,jdbcType=VARCHAR}
+  </update>
 </mapper>

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

@@ -929,7 +929,7 @@
     </choose>
   </select>
   
-  <select id="selectOrderBillByPage" resultType="com.goafanti.order.bo.FundingListBo">
+  <select id="selectOrderBillByPage" resultType="com.goafanti.order.bo.BillListBo">
 	select
 		a.order_no as orderNo,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
@@ -1212,4 +1212,96 @@
 			and a.orderChannel = #{orderChannel,jdbcType=INTEGER}
 		</if>
   </select>
+  <select id="selectBillByPage" resultType="com.goafanti.order.bo.BillListBo">
+	select
+		a.bill_no as billNo,
+		a.create_time as createTime,
+		a.transaction_amount as transactionAmount,
+		a.transaction_channel as transactionChannel,
+		a.transaction_subject as transactionSubject,
+		a.transaction_mode as transactionMode,
+		a.financial_pay_no as financialPayNo,
+		a.financial_pay_time as financialPayTime,
+		a.confirm_sign as confirmSign,
+		a.delete_sign as deleteSign,
+		b.order_no as orderNo,
+		c.name as payeeName,
+		d.name as payerName,
+		e.name as financeName,
+		f.name as salesmanName,
+		g.name as departmentName
+	from
+		t_order_bill a left join t_order b on
+		a.order_no = b.order_no left join user c on 
+		a.payee_id = c.id left join user d on
+		a.payer_id = d.id left join admin e on 
+		b.finance_id = e.id left join admin f on 
+		b.salesman_id = f.id left join department_management g on
+		f.department_id = g.id
+	where 1=1
+	<if test="payeeName != null and payeeName != ''">
+		and c.name = #{payeeName,jdbcType=VARCHAR}
+	</if>
+	<if test="payerName != null and payerName !=''">
+		and d.name = #{payerName,jdbcType=VARCHAR}
+	</if>
+	<if test="salesmanName != null and salesmanName != ''">
+		and f.name = #{salesmanName,jdbcType=VARCHAR}
+	</if>
+	<if test="financeName != null and financeName != ''">
+		and e.name = #{financeName,jdbcType=VARCHAR}
+	</if>
+	<if test="confirmSign != null">
+		and a.confirm_sign = #{confirmSign,jdbcType=INTEGER}
+	</if>
+	<if test="deleteSign != null">
+		and a.delete_sign = #{deleteSign,jdbcType=VARCHAR}
+	</if>
+	<if test="depId != null and depId != ''">
+		and f.department_id = #{depId,jdbcType=VARCHAR}
+	</if>
+	<if test="isFinance == 0"> <!-- 我的订单流水查询 -->
+		and 
+			(b.salesman_id = #{aid,jdbcType=VARCHAR} 
+		or 
+			b.finance_id = #{aid,jdbcType=VARCHAR} 
+		or 
+			b.technician_id = #{aid,jdbcType=VARCHAR})
+	</if>
+	<if test="isFinance == 1"> <!-- 我的结算流水 -->
+		and b.finance_id = #{aid,jdbcType=VARCHAR} 
+	</if>
+  </select>
+  
+  <select id="selectBillDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.BillDetailBo">
+		select
+			a.bill_no as billNo,
+			a.create_time as createTime,
+			a.transaction_amount as transactionAmount,
+			a.transaction_channel as transactionChannel,
+			a.transaction_subject as transactionSubject,
+			a.transaction_mode as transactionMode,
+			a.financial_pay_no as financialPayNo,
+			a.financial_pay_time as financialPayTime,
+			a.confirm_sign as confirmSign,
+			a.delete_sign as deleteSign,
+			a.remarks,
+			a.postscript,
+			b.order_no as orderNo,
+			c.name as payeeName,
+			d.name as payerName,
+			e.name as financeName,
+			f.name as salesmanName,
+			g.name as departmentName
+		from
+			t_order_bill a left join t_order b on
+			a.order_no = b.order_no left join user c on
+			a.payee_id = c.id left join user d on
+			a.payer_id = d.id left join admin e on
+			b.finance_id = e.id left join admin f on
+			b.salesman_id = f.id left join department_management g on
+			f.department_id = g.id
+		where
+			a.bill_no = #{billNo,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 94 - 48
src/main/java/com/goafanti/common/model/TOrderBill.java

@@ -7,89 +7,99 @@ public class TOrderBill {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.bill_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String billNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.order_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.creater
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.create_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.update_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.payee_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String payeeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.payer_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String payerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.transaction_amount
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private BigDecimal transactionAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.transaction_subject
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Integer transactionSubject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.transaction_channel
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Integer transactionChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.transaction_mode
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Integer transactionMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.remarks
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.confirm_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Integer confirmSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.delete_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Boolean deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.financial_pay_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private String financialPayNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.financial_pay_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	private Date financialPayTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.confirm_time
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	private Date confirmTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill.postscript
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	private String postscript;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.bill_no
 	 * @return  the value of t_order_bill.bill_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getBillNo() {
 		return billNo;
@@ -98,7 +108,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.bill_no
 	 * @param billNo  the value for t_order_bill.bill_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setBillNo(String billNo) {
 		this.billNo = billNo;
@@ -107,7 +117,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.order_no
 	 * @return  the value of t_order_bill.order_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -116,7 +126,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.order_no
 	 * @param orderNo  the value for t_order_bill.order_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -125,7 +135,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.creater
 	 * @return  the value of t_order_bill.creater
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -134,7 +144,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.creater
 	 * @param creater  the value for t_order_bill.creater
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -143,7 +153,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.create_time
 	 * @return  the value of t_order_bill.create_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -152,7 +162,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.create_time
 	 * @param createTime  the value for t_order_bill.create_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -161,7 +171,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.update_time
 	 * @return  the value of t_order_bill.update_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -170,7 +180,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.update_time
 	 * @param updateTime  the value for t_order_bill.update_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -179,7 +189,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.payee_id
 	 * @return  the value of t_order_bill.payee_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getPayeeId() {
 		return payeeId;
@@ -188,7 +198,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.payee_id
 	 * @param payeeId  the value for t_order_bill.payee_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setPayeeId(String payeeId) {
 		this.payeeId = payeeId;
@@ -197,7 +207,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.payer_id
 	 * @return  the value of t_order_bill.payer_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getPayerId() {
 		return payerId;
@@ -206,7 +216,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.payer_id
 	 * @param payerId  the value for t_order_bill.payer_id
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setPayerId(String payerId) {
 		this.payerId = payerId;
@@ -215,7 +225,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.transaction_amount
 	 * @return  the value of t_order_bill.transaction_amount
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public BigDecimal getTransactionAmount() {
 		return transactionAmount;
@@ -224,7 +234,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.transaction_amount
 	 * @param transactionAmount  the value for t_order_bill.transaction_amount
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setTransactionAmount(BigDecimal transactionAmount) {
 		this.transactionAmount = transactionAmount;
@@ -233,7 +243,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.transaction_subject
 	 * @return  the value of t_order_bill.transaction_subject
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Integer getTransactionSubject() {
 		return transactionSubject;
@@ -242,7 +252,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.transaction_subject
 	 * @param transactionSubject  the value for t_order_bill.transaction_subject
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setTransactionSubject(Integer transactionSubject) {
 		this.transactionSubject = transactionSubject;
@@ -251,7 +261,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.transaction_channel
 	 * @return  the value of t_order_bill.transaction_channel
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Integer getTransactionChannel() {
 		return transactionChannel;
@@ -260,7 +270,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.transaction_channel
 	 * @param transactionChannel  the value for t_order_bill.transaction_channel
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setTransactionChannel(Integer transactionChannel) {
 		this.transactionChannel = transactionChannel;
@@ -269,7 +279,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.transaction_mode
 	 * @return  the value of t_order_bill.transaction_mode
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Integer getTransactionMode() {
 		return transactionMode;
@@ -278,7 +288,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.transaction_mode
 	 * @param transactionMode  the value for t_order_bill.transaction_mode
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setTransactionMode(Integer transactionMode) {
 		this.transactionMode = transactionMode;
@@ -287,7 +297,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.remarks
 	 * @return  the value of t_order_bill.remarks
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -296,7 +306,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.remarks
 	 * @param remarks  the value for t_order_bill.remarks
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -305,7 +315,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.confirm_sign
 	 * @return  the value of t_order_bill.confirm_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Integer getConfirmSign() {
 		return confirmSign;
@@ -314,7 +324,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.confirm_sign
 	 * @param confirmSign  the value for t_order_bill.confirm_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setConfirmSign(Integer confirmSign) {
 		this.confirmSign = confirmSign;
@@ -323,7 +333,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.delete_sign
 	 * @return  the value of t_order_bill.delete_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Boolean getDeleteSign() {
 		return deleteSign;
@@ -332,7 +342,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.delete_sign
 	 * @param deleteSign  the value for t_order_bill.delete_sign
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setDeleteSign(Boolean deleteSign) {
 		this.deleteSign = deleteSign;
@@ -341,7 +351,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.financial_pay_no
 	 * @return  the value of t_order_bill.financial_pay_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getFinancialPayNo() {
 		return financialPayNo;
@@ -350,7 +360,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.financial_pay_no
 	 * @param financialPayNo  the value for t_order_bill.financial_pay_no
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setFinancialPayNo(String financialPayNo) {
 		this.financialPayNo = financialPayNo;
@@ -359,7 +369,7 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.financial_pay_time
 	 * @return  the value of t_order_bill.financial_pay_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Date getFinancialPayTime() {
 		return financialPayTime;
@@ -368,9 +378,45 @@ public class TOrderBill {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.financial_pay_time
 	 * @param financialPayTime  the value for t_order_bill.financial_pay_time
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setFinancialPayTime(Date financialPayTime) {
 		this.financialPayTime = financialPayTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.confirm_time
+	 * @return  the value of t_order_bill.confirm_time
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	public Date getConfirmTime() {
+		return confirmTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.confirm_time
+	 * @param confirmTime  the value for t_order_bill.confirm_time
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	public void setConfirmTime(Date confirmTime) {
+		this.confirmTime = confirmTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bill.postscript
+	 * @return  the value of t_order_bill.postscript
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	public String getPostscript() {
+		return postscript;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bill.postscript
+	 * @param postscript  the value for t_order_bill.postscript
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
+	 */
+	public void setPostscript(String postscript) {
+		this.postscript = postscript;
+	}
 }

+ 146 - 16
src/main/java/com/goafanti/common/model/TOrderBillExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderBillExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public TOrderBillExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderBillExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1193,11 +1193,141 @@ public class TOrderBillExample {
 			addCriterion("financial_pay_time not between", value1, value2, "financialPayTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andConfirmTimeIsNull() {
+			addCriterion("confirm_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeIsNotNull() {
+			addCriterion("confirm_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeEqualTo(Date value) {
+			addCriterion("confirm_time =", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeNotEqualTo(Date value) {
+			addCriterion("confirm_time <>", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeGreaterThan(Date value) {
+			addCriterion("confirm_time >", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("confirm_time >=", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeLessThan(Date value) {
+			addCriterion("confirm_time <", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeLessThanOrEqualTo(Date value) {
+			addCriterion("confirm_time <=", value, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeIn(List<Date> values) {
+			addCriterion("confirm_time in", values, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeNotIn(List<Date> values) {
+			addCriterion("confirm_time not in", values, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeBetween(Date value1, Date value2) {
+			addCriterion("confirm_time between", value1, value2, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andConfirmTimeNotBetween(Date value1, Date value2) {
+			addCriterion("confirm_time not between", value1, value2, "confirmTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptIsNull() {
+			addCriterion("postscript is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptIsNotNull() {
+			addCriterion("postscript is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptEqualTo(String value) {
+			addCriterion("postscript =", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptNotEqualTo(String value) {
+			addCriterion("postscript <>", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptGreaterThan(String value) {
+			addCriterion("postscript >", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptGreaterThanOrEqualTo(String value) {
+			addCriterion("postscript >=", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptLessThan(String value) {
+			addCriterion("postscript <", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptLessThanOrEqualTo(String value) {
+			addCriterion("postscript <=", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptLike(String value) {
+			addCriterion("postscript like", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptNotLike(String value) {
+			addCriterion("postscript not like", value, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptIn(List<String> values) {
+			addCriterion("postscript in", values, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptNotIn(List<String> values) {
+			addCriterion("postscript not in", values, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptBetween(String value1, String value2) {
+			addCriterion("postscript between", value1, value2, "postscript");
+			return (Criteria) this;
+		}
+
+		public Criteria andPostscriptNotBetween(String value1, String value2) {
+			addCriterion("postscript not between", value1, value2, "postscript");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bill
-	 * @mbg.generated  Wed Jan 17 16:45:46 CST 2018
+	 * @mbg.generated  Wed Jan 24 10:59:50 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 18 - 0
src/main/java/com/goafanti/order/bo/BillDetailBo.java

@@ -0,0 +1,18 @@
+package com.goafanti.order.bo;
+
+public class BillDetailBo extends BillListBo{
+	private String postscript;
+	private String remarks;
+	public String getPostscript() {
+		return postscript;
+	}
+	public void setPostscript(String postscript) {
+		this.postscript = postscript;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+}

+ 64 - 25
src/main/java/com/goafanti/order/bo/BillListBo.java

@@ -5,47 +5,38 @@ import java.math.BigDecimal;
 public class BillListBo {
 	/** 订单编号 **/
 	private String orderNo;
-	/** 商品id **/
-	private String commodityId;
-	/** 商品名称 **/
-	private String commodityName;
-	/** 商品类型 **/
-	private Integer commodityType;
 	/** 支付流水时间 **/
 	private String createTime;
 	/** 交易科目 **/
 	private Integer transactionSubject;
 	/** 交易金额 **/
 	private BigDecimal transactionAmount;
+	/** 交易方式 **/
+	private Integer transactionMode;
 	/** 业务描述  收入 与 支出**/
 	private String businessDesc;
 	/** 确认标示 **/
 	private Integer confirmSign;
-	
+	/** 删除标示 **/
+	private Integer deleteSign;
+	/** 财务流水号**/
+	private String financialPayNo;
+	/** 财务流水时间 **/
+	private String financialPayTime;
+	/** 营销员 **/
+	private String salesmanName;
+	/** 财务负责人 **/
+	private String financeName;
+	/** 技术员 **/
+	private String technicianName;
+	/** 关联部门名称 **/
+	private String departmentName;
 	public String getOrderNo() {
 		return orderNo;
 	}
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 	}
-	public String getCommodityId() {
-		return commodityId;
-	}
-	public void setCommodityId(String commodityId) {
-		this.commodityId = commodityId;
-	}
-	public String getCommodityName() {
-		return commodityName;
-	}
-	public void setCommodityName(String commodityName) {
-		this.commodityName = commodityName;
-	}
-	public Integer getCommodityType() {
-		return commodityType;
-	}
-	public void setCommodityType(Integer commodityType) {
-		this.commodityType = commodityType;
-	}
 	public String getCreateTime() {
 		return createTime;
 	}
@@ -58,6 +49,12 @@ public class BillListBo {
 	public void setTransactionSubject(Integer transactionSubject) {
 		this.transactionSubject = transactionSubject;
 	}
+	public Integer getTransactionMode() {
+		return transactionMode;
+	}
+	public void setTransactionMode(Integer transactionMode) {
+		this.transactionMode = transactionMode;
+	}
 	public BigDecimal getTransactionAmount() {
 		return transactionAmount;
 	}
@@ -76,4 +73,46 @@ public class BillListBo {
 	public void setConfirmSign(Integer confirmSign) {
 		this.confirmSign = confirmSign;
 	}
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	public String getFinancialPayNo() {
+		return financialPayNo;
+	}
+	public void setFinancialPayNo(String financialPayNo) {
+		this.financialPayNo = financialPayNo;
+	}
+	public String getFinancialPayTime() {
+		return financialPayTime;
+	}
+	public void setFinancialPayTime(String financialPayTime) {
+		this.financialPayTime = financialPayTime;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+	public String getTechnicianName() {
+		return technicianName;
+	}
+	public void setTechnicianName(String technicianName) {
+		this.technicianName = technicianName;
+	}
+	public String getDepartmentName() {
+		return departmentName;
+	}
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
 }

+ 108 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -13,6 +13,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.order.bo.OrderListBo;
+import com.goafanti.order.enums.AuditState;
 import com.goafanti.order.service.OrderService;
 
 @RestController
@@ -293,6 +294,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 	
 	/** 查询公共订单 **/
+	@RequestMapping(value = "/listPublicOrder", method = RequestMethod.POST)
 	public Result listPublicOrder(Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		orderServiceImpl.listPublicOrder(pageNo,pageSize);
@@ -300,7 +302,8 @@ public class AdminOrderApiController extends CertifyApiController {
 	}
 	
 	/** 分配订单到营销员 **/
-	public Result updateAppointSalesman(String orderNo,String salesmanId){
+	@RequestMapping(value = "/appointSalesman", method = RequestMethod.POST)
+	public Result appointSalesman(String orderNo,String salesmanId){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
@@ -313,4 +316,108 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateAppointSalesman(orderNo, salesmanId);
 		return res;
 	}
+
+	/** 我的结算流水查询 **/
+	@RequestMapping(value = "/selectMySettlementList", method = RequestMethod.POST)
+	public Result selectMySettlementList(String payeeName, String payerName, String depId,
+			String salesmanName,String orderNo, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(orderServiceImpl.selectMySettlementList(payeeName, payerName, depId, salesmanName, orderNo, pageNo, pageSize));
+		return res;
+	}
+	
+	/** 我的订单流水查询 **/
+	@RequestMapping(value = "/selectMyBillList", method = RequestMethod.POST)
+	public Result selectMyBillList(String payeeName, String payerName, String depId,
+			String salesmanName,String orderNo, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(orderServiceImpl.selectMyBillList(payeeName, payerName, depId, salesmanName, orderNo, pageNo, pageSize));
+		return res;
+	}
+	
+
+	/** 所有订单流水查询 **/
+	@RequestMapping(value = "/selectAllBillList", method = RequestMethod.POST)
+	public Result selectAllBillList(String payeeName, String payerName, String depId,
+			String salesmanName,String financeName,String orderNo, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(orderServiceImpl.selectAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo, pageNo, pageSize));
+		return res;
+	}
+	
+	/** 查询流水详情 **/
+	@RequestMapping(value = "/selectBillDetail", method = RequestMethod.GET)
+	public Result selectBillDetail(String billNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(billNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","流水编号"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectBillDetail(billNo));
+		return res;
+	}
+	
+	/**
+	 * 订单流水确认
+	 * @param billNo
+	 * @param orderNo
+	 * @param confirm
+	 * @param financialPayNo
+	 * @param financialPayTime
+	 * @param remarks
+	 * @return
+	 */
+	@RequestMapping(value = "/confrimBill", method = RequestMethod.POST)
+	public Result confrimBill(String billNo,String orderNo,Integer confirm,String financialPayNo,String financialPayTime,String remarks){
+		Result res = new Result();
+		if(StringUtils.isBlank(billNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","流水编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(null == confirm){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","确认状态"));
+			return res;
+		}else if(confirm  == AuditState.AUDIT_SUCCESS.getCode()){
+			if(StringUtils.isBlank(financialPayNo) || StringUtils.isBlank(financialPayTime)){
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水号和财务流水时间"));
+				return res;
+			}
+		}
+		orderServiceImpl.updateBill(billNo,orderNo,confirm,financialPayNo,financialPayTime,remarks);
+		return res;
+	}
+	
+	/**
+	 * 修改流水
+	 * @param billNo
+	 * @param financialPayNo
+	 * @param financialPayTime
+	 * @param remarks
+	 * @return
+	 */
+	@RequestMapping(value = "/updateBill", method = RequestMethod.POST)
+	public Result updateBill(String billNo, String financialPayNo, String financialPayTime, String remarks){
+		Result res = new Result();
+		if(StringUtils.isBlank(billNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","流水编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(financialPayNo) || StringUtils.isBlank(financialPayTime)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水号和财务流水时间"));
+			return res;
+		}
+		orderServiceImpl.updateBill(billNo, financialPayNo, financialPayTime, remarks);
+		return res;
+	}
+
+	/** 查询立项订单 **/
+	@RequestMapping(value = "/listSetUpServiceOrder", method = RequestMethod.POST)
+	public Result listSetUpServiceOrder(Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		return res;
+	}
 }

+ 72 - 2
src/main/java/com/goafanti/order/service/OrderService.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
@@ -68,11 +69,11 @@ public interface OrderService {
 	C2BOrderDetailBo selectOrderDetail(String orderNo);
 
 	/**
-	 * 查询流水记录
+	 * 用户查询流水记录
 	 * @param orderNo
 	 * @return
 	 */
-	Pagination<BillListBo> selectOrderBillList(String orderNo,Integer pageNo,Integer PageSize);
+	Pagination<BillListBo> selectOrderBillList(String orderNo,Integer pageNo,Integer pageSize);
 
 	/**
 	 * 提现
@@ -248,4 +249,73 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateAppointSalesman(String orderNo,String salesmanId);
+	
+	/**
+	 * 我的结算流水
+	 * @param payeeName 收款人
+	 * @param payerName 付款人
+	 * @param depId 部门id
+	 * @param salesmanName 营销员
+	 * @param financeName 财务
+	 * @param orderNo 订单编号
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<BillListBo> selectMySettlementList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
+			Integer pageNo,Integer pageSize);
+	
+	/**
+	 * 我的订单流水查询
+	 * @param payeeName 收款人
+	 * @param payerName 付款人
+	 * @param depId 部门id
+	 * @param salesmanName 营销员
+	 * @param orderNo 订单编号
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<BillListBo> selectMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
+			Integer pageNo,Integer pageSize);
+	
+	/**
+	 * 所有订单流水查询
+	 * @param payeeName
+	 * @param payerName
+	 * @param depId
+	 * @param salesmanName
+	 * @param orderNo
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<BillListBo> selectAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
+			Integer pageNo,Integer pageSize);
+	
+	/**
+	 * 查看流水详情
+	 * @param billNo
+	 * @return
+	 */
+	BillDetailBo selectBillDetail(String billNo);
+
+	/**
+	 * 确认流水订单
+	 * @param billNo
+	 * @param orderNo
+	 * @param confrim
+	 * @return
+	 */
+	int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
+	
+	
+	/**
+	 * 确认流水订单
+	 * @param billNo
+	 * @param orderNo
+	 * @param confrim
+	 * @return
+	 */
+	int updateBill(String billNo,String financialPayNo,String financialPayTime,String remarks);
 }

+ 129 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -35,6 +35,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.OperatorActive;
@@ -1134,4 +1135,132 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BillListBo> selectMySettlementList(String payeeName, String payerName, String depId,
+			String salesmanName, String orderNo, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
+		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
+		if(orderNo != null) params.put("orderNo", orderNo);
+		/** 特殊处理字段开始 **/
+		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			params.put("isFinance", 1);
+		}
+		params.put("aid", TokenManager.getAdminId());
+		/** 特殊处理字段结束 **/
+		Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
+		List<BillListBo> list = (List<BillListBo>)data.getList();
+		if(list.size()>0){
+			for(BillListBo bo:list){
+				bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
+			}
+		}
+		data.setList(list);
+		return data;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BillListBo> selectMyBillList(String payeeName, String payerName, String depId,
+			String salesmanName,String orderNo, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
+		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
+		if(orderNo != null) params.put("orderNo", orderNo);
+		/** 特殊处理字段开始 **/
+		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+			params.put("isFinance", 0);
+		}
+		params.put("aid", TokenManager.getAdminId());
+		/** 特殊处理字段结束 **/
+		Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
+		List<BillListBo> list = (List<BillListBo>)data.getList();
+		if(list.size()>0){
+			for(BillListBo bo:list){
+				bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
+			}
+		}
+		data.setList(list);
+		return data;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BillListBo> selectAllBillList(String payeeName, String payerName, String depId,
+			String salesmanName ,String financeName, String orderNo, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
+		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
+		if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
+		if(orderNo != null) params.put("orderNo", orderNo);
+		Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
+		List<BillListBo> list = (List<BillListBo>)data.getList();
+		if(list.size()>0){
+			for(BillListBo bo:list){
+				bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
+			}
+		}
+		data.setList(list);
+		return data;
+	}
+
+	@Override
+	public BillDetailBo selectBillDetail(String billNo) {
+		return tOrderMapper.selectBillDetail(billNo);
+	}
+
+	@Override
+	@Transactional
+	public int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks) {
+		TOrderBill bill = tOrderBillMapper.selectByPrimaryKey(billNo);
+		TOrder order = tOrderMapper.selectByPrimaryKey(orderNo);
+		if(bill != null && order != null){
+			bill.setBillNo(billNo);
+			bill.setFinancialPayNo(financialPayNo);
+			try {
+				bill.setFinancialPayTime(DateUtils.parseDate(financialPayTime, AFTConstants.YYYYMMDDHHMMSS));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			bill.setRemarks(remarks);
+			if(confrim == AFTConstants.YES){
+				bill.setConfirmSign(AuditState.AUDIT_SUCCESS.getCode());
+				checkOrder(order);
+				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode())
+					setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
+				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
+					setOrderState(OrderAction.CONFIRM_PAY_FOR_LAST, bill.getTransactionAmount(), order, false);
+				order.setUpdateTime(new Date());
+				tOrderMapper.updateByPrimaryKeySelective(order);
+			}else if(confrim == AFTConstants.NO){
+				bill.setConfirmSign(AuditState.AUDIT_FAIL.getCode());
+				bill.setDeleteSign(Boolean.TRUE);
+			}
+			tOrderBillMapper.updateByPrimaryKey(bill);
+		}
+		return 1;
+	}
+
+	@Override
+	public int updateBill(String billNo, String financialPayNo, String financialPayTime, String remarks) {
+		TOrderBill bill = new TOrderBill();
+		bill.setBillNo(billNo);
+		bill.setFinancialPayNo(financialPayNo);
+		try {
+			bill.setFinancialPayTime(DateUtils.parseDate(financialPayTime, AFTConstants.YYYYMMDDHHMMSS));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		bill.setRemarks(remarks);
+		tOrderBillMapper.updateByPrimaryKey(bill);
+		return 1;
+	}
+	
 }