Browse Source

订单管理

wanghui 8 years ago
parent
commit
096eb010bd
29 changed files with 3697 additions and 2154 deletions
  1. 2 0
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  2. 0 64
      src/main/java/com/goafanti/common/dao/TFundingRecordersMapper.java
  3. 52 0
      src/main/java/com/goafanti/common/dao/TFundingRecordsMapper.java
  4. 21 11
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  5. 55 55
      src/main/java/com/goafanti/common/mapper/TFundingRecordersMapper.xml
  6. 213 71
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  7. 0 468
      src/main/java/com/goafanti/common/model/TFundingRecorders.java
  8. 0 1184
      src/main/java/com/goafanti/common/model/TFundingRecordersExample.java
  9. 330 0
      src/main/java/com/goafanti/common/model/TFundingRecords.java
  10. 1153 0
      src/main/java/com/goafanti/common/model/TFundingRecordsExample.java
  11. 204 112
      src/main/java/com/goafanti/common/model/TOrder.java
  12. 388 128
      src/main/java/com/goafanti/common/model/TOrderExample.java
  13. 185 0
      src/main/java/com/goafanti/common/utils/DecimalCalculate.java
  14. 60 0
      src/main/java/com/goafanti/order/bo/FundingListBo.java
  15. 81 0
      src/main/java/com/goafanti/order/bo/OperatorActive.java
  16. 34 18
      src/main/java/com/goafanti/order/bo/OrderDetailBo.java
  17. 0 5
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  18. 147 12
      src/main/java/com/goafanti/order/controller/OrderController.java
  19. 51 0
      src/main/java/com/goafanti/order/enums/AuditState.java
  20. 5 5
      src/main/java/com/goafanti/order/enums/OrderType.java
  21. 13 0
      src/main/java/com/goafanti/order/enums/OrderAction.java
  22. 4 4
      src/main/java/com/goafanti/order/enums/OrderChannel.java
  23. 4 4
      src/main/java/com/goafanti/order/enums/PayChannel.java
  24. 8 6
      src/main/java/com/goafanti/order/enums/PaymentState.java
  25. 5 5
      src/main/java/com/goafanti/order/enums/TransactionState.java
  26. 56 0
      src/main/java/com/goafanti/order/enums/TransactionSubject.java
  27. 80 0
      src/main/java/com/goafanti/order/service/OrderService.java
  28. 543 1
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  29. 3 1
      src/main/resources/props/error.properties

+ 2 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -117,4 +117,6 @@ public class ErrorConstants {
 	public static final String	SON_ALREADY_EXIST					= "SON_ALREADY_EXIST";
 	
 	public static final String USER_NICKNAME_EXIST					= "USER_NICKNAME_EXIST";
+	
+	public static final String NOT_ACCORD_WITH_NEXT					= "NOT_ACCORD_WITH_NEXT";
 }

+ 0 - 64
src/main/java/com/goafanti/common/dao/TFundingRecordersMapper.java

@@ -1,64 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TFundingRecorders;
-import com.goafanti.common.model.TFundingRecordersExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TFundingRecordersMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    long countByExample(TFundingRecordersExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    int deleteByExample(TFundingRecordersExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    int insert(TFundingRecorders record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    int insertSelective(TFundingRecorders record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    List<TFundingRecorders> selectByExample(TFundingRecordersExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    int updateByExampleSelective(@Param("record") TFundingRecorders record, @Param("example") TFundingRecordersExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_funding_recorders
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    int updateByExample(@Param("record") TFundingRecorders record, @Param("example") TFundingRecordersExample example);
-}

+ 52 - 0
src/main/java/com/goafanti/common/dao/TFundingRecordsMapper.java

@@ -0,0 +1,52 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TFundingRecords;
+import com.goafanti.common.model.TFundingRecordsExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TFundingRecordsMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	long countByExample(TFundingRecordsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	int deleteByExample(TFundingRecordsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	int insert(TFundingRecords record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	int insertSelective(TFundingRecords record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	List<TFundingRecords> selectByExample(TFundingRecordsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") TFundingRecords record,
+			@Param("example") TFundingRecordsExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_funding_records
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	int updateByExample(@Param("record") TFundingRecords record, @Param("example") TFundingRecordsExample example);
+}

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

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderExample;
+import com.goafanti.order.bo.OrderDetailBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,67 +11,75 @@ public interface TOrderMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	long countByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int deleteByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int deleteByPrimaryKey(Long orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int insert(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int insertSelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	List<TOrder> selectByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	TOrder selectByPrimaryKey(Long orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int updateByExample(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int updateByPrimaryKeySelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	int updateByPrimaryKey(TOrder record);
+
+	/**
+	 *  查看商品详情
+	 * @param commodityId
+	 * @param orderType
+	 * @return
+	 */
+	OrderDetailBo selectCommodityDetail(@Param("commodityId")String commodityId, @Param("commodityType")Integer commodityType);
 }

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TFundingRecordersMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TFundingRecorders">
+<mapper namespace="com.goafanti.common.dao.TFundingRecordsMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TFundingRecords">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    <result column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_id" jdbcType="BIGINT" property="orderId" />
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="order_no" jdbcType="BIGINT" property="orderNo" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -18,15 +18,15 @@
     <result column="transaction_subject" jdbcType="INTEGER" property="transactionSubject" />
     <result column="transaction_channel" jdbcType="INTEGER" property="transactionChannel" />
     <result column="transaction_mode" jdbcType="INTEGER" property="transactionMode" />
-    <result column="comments" jdbcType="VARCHAR" property="comments" />
-    <result column="confirm_sign" jdbcType="BIT" property="confirmSign" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="confirm_sign" jdbcType="INTEGER" property="confirmSign" />
     <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
   </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 Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -60,7 +60,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -94,24 +94,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    id, order_id, creater, create_time, update_time, payee_id, payer_id, transaction_amount, 
-    transaction_subject, transaction_channel, transaction_mode, comments, confirm_sign, 
+    id, order_no, creater, create_time, update_time, payee_id, payer_id, transaction_amount, 
+    transaction_subject, transaction_channel, transaction_mode, remarks, confirm_sign, 
     delete_sign
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TFundingRecordersExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TFundingRecordsExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from t_funding_recorders
+    from t_funding_records
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -119,47 +119,47 @@
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TFundingRecordersExample">
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TFundingRecordsExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    delete from t_funding_recorders
+    delete from t_funding_records
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TFundingRecorders">
+  <insert id="insert" parameterType="com.goafanti.common.model.TFundingRecords">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    insert into t_funding_recorders (id, order_id, creater, 
+    insert into t_funding_records (id, order_no, creater, 
       create_time, update_time, payee_id, 
       payer_id, transaction_amount, transaction_subject, 
-      transaction_channel, transaction_mode, comments, 
+      transaction_channel, transaction_mode, remarks, 
       confirm_sign, delete_sign)
-    values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{creater,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{orderNo,jdbcType=BIGINT}, #{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}, #{comments,jdbcType=VARCHAR}, 
-      #{confirmSign,jdbcType=BIT}, #{deleteSign,jdbcType=BIT})
+      #{transactionChannel,jdbcType=INTEGER}, #{transactionMode,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, 
+      #{confirmSign,jdbcType=INTEGER}, #{deleteSign,jdbcType=BIT})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TFundingRecorders">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TFundingRecords">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    insert into t_funding_recorders
+    insert into t_funding_records
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="orderId != null">
-        order_id,
+      <if test="orderNo != null">
+        order_no,
       </if>
       <if test="creater != null">
         creater,
@@ -188,8 +188,8 @@
       <if test="transactionMode != null">
         transaction_mode,
       </if>
-      <if test="comments != null">
-        comments,
+      <if test="remarks != null">
+        remarks,
       </if>
       <if test="confirmSign != null">
         confirm_sign,
@@ -200,10 +200,10 @@
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        #{id,jdbcType=BIGINT},
+        #{id,jdbcType=VARCHAR},
       </if>
-      <if test="orderId != null">
-        #{orderId,jdbcType=BIGINT},
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=BIGINT},
       </if>
       <if test="creater != null">
         #{creater,jdbcType=VARCHAR},
@@ -232,24 +232,24 @@
       <if test="transactionMode != null">
         #{transactionMode,jdbcType=INTEGER},
       </if>
-      <if test="comments != null">
-        #{comments,jdbcType=VARCHAR},
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
       </if>
       <if test="confirmSign != null">
-        #{confirmSign,jdbcType=BIT},
+        #{confirmSign,jdbcType=INTEGER},
       </if>
       <if test="deleteSign != null">
         #{deleteSign,jdbcType=BIT},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TFundingRecordersExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TFundingRecordsExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    select count(*) from t_funding_recorders
+    select count(*) from t_funding_records
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -258,15 +258,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    update t_funding_recorders
+    update t_funding_records
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.orderId != null">
-        order_id = #{record.orderId,jdbcType=BIGINT},
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=BIGINT},
       </if>
       <if test="record.creater != null">
         creater = #{record.creater,jdbcType=VARCHAR},
@@ -295,11 +295,11 @@
       <if test="record.transactionMode != null">
         transaction_mode = #{record.transactionMode,jdbcType=INTEGER},
       </if>
-      <if test="record.comments != null">
-        comments = #{record.comments,jdbcType=VARCHAR},
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
       </if>
       <if test="record.confirmSign != null">
-        confirm_sign = #{record.confirmSign,jdbcType=BIT},
+        confirm_sign = #{record.confirmSign,jdbcType=INTEGER},
       </if>
       <if test="record.deleteSign != null">
         delete_sign = #{record.deleteSign,jdbcType=BIT},
@@ -313,11 +313,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 14:28:37 CST 2017.
+      This element was generated on Tue Dec 26 11:19:48 CST 2017.
     -->
-    update t_funding_recorders
-    set id = #{record.id,jdbcType=BIGINT},
-      order_id = #{record.orderId,jdbcType=BIGINT},
+    update t_funding_records
+    set id = #{record.id,jdbcType=VARCHAR},
+      order_no = #{record.orderNo,jdbcType=BIGINT},
       creater = #{record.creater,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -327,8 +327,8 @@
       transaction_subject = #{record.transactionSubject,jdbcType=INTEGER},
       transaction_channel = #{record.transactionChannel,jdbcType=INTEGER},
       transaction_mode = #{record.transactionMode,jdbcType=INTEGER},
-      comments = #{record.comments,jdbcType=VARCHAR},
-      confirm_sign = #{record.confirmSign,jdbcType=BIT},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      confirm_sign = #{record.confirmSign,jdbcType=INTEGER},
       delete_sign = #{record.deleteSign,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />

+ 213 - 71
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     <id column="order_no" jdbcType="BIGINT" property="orderNo" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
@@ -14,29 +14,33 @@
     <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
     <result column="seller_id" jdbcType="VARCHAR" property="sellerId" />
     <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
+    <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
+    <result column="commodity_price" jdbcType="DECIMAL" property="commodityPrice" />
     <result column="commodity_type" jdbcType="INTEGER" property="commodityType" />
+    <result column="commodity_mode" jdbcType="VARCHAR" property="commodityMode" />
     <result column="first_payment" jdbcType="DECIMAL" property="firstPayment" />
-    <result column="total_payment" jdbcType="DECIMAL" property="totalPayment" />
+    <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
     <result column="brokerage_amount" jdbcType="DECIMAL" property="brokerageAmount" />
     <result column="brokerage_proportion" jdbcType="DECIMAL" property="brokerageProportion" />
     <result column="actually_first_payment" jdbcType="DECIMAL" property="actuallyFirstPayment" />
     <result column="actually_total_payment" jdbcType="DECIMAL" property="actuallyTotalPayment" />
     <result column="actually_brokerage_amount" jdbcType="DECIMAL" property="actuallyBrokerageAmount" />
-    <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
     <result column="order_status" jdbcType="INTEGER" property="orderStatus" />
     <result column="intention_status" jdbcType="INTEGER" property="intentionStatus" />
     <result column="trading_status" jdbcType="INTEGER" property="tradingStatus" />
     <result column="technology_transfer_progress" jdbcType="INTEGER" property="technologyTransferProgress" />
     <result column="payment_status" jdbcType="INTEGER" property="paymentStatus" />
     <result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
-    <result column="order_follow" jdbcType="VARCHAR" property="orderFollow" />
+    <result column="order_follower" jdbcType="VARCHAR" property="orderFollower" />
     <result column="order_channel" jdbcType="INTEGER" property="orderChannel" />
+    <result column="order_remarks" jdbcType="VARCHAR" property="orderRemarks" />
+    <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
   </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 Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -70,7 +74,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -104,19 +108,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
-    order_no, creater, create_time, update_time, buyer_id, seller_id, commodity_id, commodity_type, 
-    first_payment, total_payment, brokerage_amount, brokerage_proportion, actually_first_payment, 
-    actually_total_payment, actually_brokerage_amount, delete_sign, order_status, intention_status, 
-    trading_status, technology_transfer_progress, payment_status, liquidation_status, 
-    order_follow, order_channel
+    order_no, creater, create_time, update_time, buyer_id, seller_id, commodity_id, commodity_quantity, 
+    commodity_price, commodity_type, commodity_mode, first_payment, order_amount, brokerage_amount, 
+    brokerage_proportion, actually_first_payment, actually_total_payment, actually_brokerage_amount, 
+    order_status, intention_status, trading_status, technology_transfer_progress, payment_status, 
+    liquidation_status, order_follower, order_channel, order_remarks, delete_sign
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     select
     <if test="distinct">
@@ -135,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -146,7 +150,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=BIGINT}
@@ -155,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -166,32 +170,36 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     insert into t_order (order_no, creater, create_time, 
       update_time, buyer_id, seller_id, 
-      commodity_id, commodity_type, first_payment, 
-      total_payment, brokerage_amount, brokerage_proportion, 
+      commodity_id, commodity_quantity, commodity_price, 
+      commodity_type, commodity_mode, first_payment, 
+      order_amount, brokerage_amount, brokerage_proportion, 
       actually_first_payment, actually_total_payment, 
-      actually_brokerage_amount, delete_sign, order_status, 
-      intention_status, trading_status, technology_transfer_progress, 
-      payment_status, liquidation_status, order_follow, 
-      order_channel)
+      actually_brokerage_amount, order_status, intention_status, 
+      trading_status, technology_transfer_progress, 
+      payment_status, liquidation_status, order_follower, 
+      order_channel, order_remarks, delete_sign
+      )
     values (#{orderNo,jdbcType=BIGINT}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, #{sellerId,jdbcType=VARCHAR}, 
-      #{commodityId,jdbcType=VARCHAR}, #{commodityType,jdbcType=INTEGER}, #{firstPayment,jdbcType=DECIMAL}, 
-      #{totalPayment,jdbcType=DECIMAL}, #{brokerageAmount,jdbcType=DECIMAL}, #{brokerageProportion,jdbcType=DECIMAL}, 
+      #{commodityId,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
+      #{commodityType,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{firstPayment,jdbcType=DECIMAL}, 
+      #{orderAmount,jdbcType=DECIMAL}, #{brokerageAmount,jdbcType=DECIMAL}, #{brokerageProportion,jdbcType=DECIMAL}, 
       #{actuallyFirstPayment,jdbcType=DECIMAL}, #{actuallyTotalPayment,jdbcType=DECIMAL}, 
-      #{actuallyBrokerageAmount,jdbcType=DECIMAL}, #{deleteSign,jdbcType=BIT}, #{orderStatus,jdbcType=INTEGER}, 
-      #{intentionStatus,jdbcType=INTEGER}, #{tradingStatus,jdbcType=INTEGER}, #{technologyTransferProgress,jdbcType=INTEGER}, 
-      #{paymentStatus,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER}, #{orderFollow,jdbcType=VARCHAR}, 
-      #{orderChannel,jdbcType=INTEGER})
+      #{actuallyBrokerageAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, #{intentionStatus,jdbcType=INTEGER}, 
+      #{tradingStatus,jdbcType=INTEGER}, #{technologyTransferProgress,jdbcType=INTEGER}, 
+      #{paymentStatus,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER}, #{orderFollower,jdbcType=VARCHAR}, 
+      #{orderChannel,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=BIT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -216,14 +224,23 @@
       <if test="commodityId != null">
         commodity_id,
       </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
       <if test="commodityType != null">
         commodity_type,
       </if>
+      <if test="commodityMode != null">
+        commodity_mode,
+      </if>
       <if test="firstPayment != null">
         first_payment,
       </if>
-      <if test="totalPayment != null">
-        total_payment,
+      <if test="orderAmount != null">
+        order_amount,
       </if>
       <if test="brokerageAmount != null">
         brokerage_amount,
@@ -240,9 +257,6 @@
       <if test="actuallyBrokerageAmount != null">
         actually_brokerage_amount,
       </if>
-      <if test="deleteSign != null">
-        delete_sign,
-      </if>
       <if test="orderStatus != null">
         order_status,
       </if>
@@ -261,12 +275,18 @@
       <if test="liquidationStatus != null">
         liquidation_status,
       </if>
-      <if test="orderFollow != null">
-        order_follow,
+      <if test="orderFollower != null">
+        order_follower,
       </if>
       <if test="orderChannel != null">
         order_channel,
       </if>
+      <if test="orderRemarks != null">
+        order_remarks,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -290,14 +310,23 @@
       <if test="commodityId != null">
         #{commodityId,jdbcType=VARCHAR},
       </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
       <if test="commodityType != null">
         #{commodityType,jdbcType=INTEGER},
       </if>
+      <if test="commodityMode != null">
+        #{commodityMode,jdbcType=VARCHAR},
+      </if>
       <if test="firstPayment != null">
         #{firstPayment,jdbcType=DECIMAL},
       </if>
-      <if test="totalPayment != null">
-        #{totalPayment,jdbcType=DECIMAL},
+      <if test="orderAmount != null">
+        #{orderAmount,jdbcType=DECIMAL},
       </if>
       <if test="brokerageAmount != null">
         #{brokerageAmount,jdbcType=DECIMAL},
@@ -314,9 +343,6 @@
       <if test="actuallyBrokerageAmount != null">
         #{actuallyBrokerageAmount,jdbcType=DECIMAL},
       </if>
-      <if test="deleteSign != null">
-        #{deleteSign,jdbcType=BIT},
-      </if>
       <if test="orderStatus != null">
         #{orderStatus,jdbcType=INTEGER},
       </if>
@@ -335,19 +361,25 @@
       <if test="liquidationStatus != null">
         #{liquidationStatus,jdbcType=INTEGER},
       </if>
-      <if test="orderFollow != null">
-        #{orderFollow,jdbcType=VARCHAR},
+      <if test="orderFollower != null">
+        #{orderFollower,jdbcType=VARCHAR},
       </if>
       <if test="orderChannel != null">
         #{orderChannel,jdbcType=INTEGER},
       </if>
+      <if test="orderRemarks != null">
+        #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -358,7 +390,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     update t_order
     <set>
@@ -383,14 +415,23 @@
       <if test="record.commodityId != null">
         commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       </if>
+      <if test="record.commodityQuantity != null">
+        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityPrice != null">
+        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      </if>
       <if test="record.commodityType != null">
         commodity_type = #{record.commodityType,jdbcType=INTEGER},
       </if>
+      <if test="record.commodityMode != null">
+        commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      </if>
       <if test="record.firstPayment != null">
         first_payment = #{record.firstPayment,jdbcType=DECIMAL},
       </if>
-      <if test="record.totalPayment != null">
-        total_payment = #{record.totalPayment,jdbcType=DECIMAL},
+      <if test="record.orderAmount != null">
+        order_amount = #{record.orderAmount,jdbcType=DECIMAL},
       </if>
       <if test="record.brokerageAmount != null">
         brokerage_amount = #{record.brokerageAmount,jdbcType=DECIMAL},
@@ -407,9 +448,6 @@
       <if test="record.actuallyBrokerageAmount != null">
         actually_brokerage_amount = #{record.actuallyBrokerageAmount,jdbcType=DECIMAL},
       </if>
-      <if test="record.deleteSign != null">
-        delete_sign = #{record.deleteSign,jdbcType=BIT},
-      </if>
       <if test="record.orderStatus != null">
         order_status = #{record.orderStatus,jdbcType=INTEGER},
       </if>
@@ -428,12 +466,18 @@
       <if test="record.liquidationStatus != null">
         liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.orderFollow != null">
-        order_follow = #{record.orderFollow,jdbcType=VARCHAR},
+      <if test="record.orderFollower != null">
+        order_follower = #{record.orderFollower,jdbcType=VARCHAR},
       </if>
       <if test="record.orderChannel != null">
         order_channel = #{record.orderChannel,jdbcType=INTEGER},
       </if>
+      <if test="record.orderRemarks != null">
+        order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -443,7 +487,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=BIGINT},
@@ -453,23 +497,27 @@
       buyer_id = #{record.buyerId,jdbcType=VARCHAR},
       seller_id = #{record.sellerId,jdbcType=VARCHAR},
       commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
       commodity_type = #{record.commodityType,jdbcType=INTEGER},
+      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
       first_payment = #{record.firstPayment,jdbcType=DECIMAL},
-      total_payment = #{record.totalPayment,jdbcType=DECIMAL},
+      order_amount = #{record.orderAmount,jdbcType=DECIMAL},
       brokerage_amount = #{record.brokerageAmount,jdbcType=DECIMAL},
       brokerage_proportion = #{record.brokerageProportion,jdbcType=DECIMAL},
       actually_first_payment = #{record.actuallyFirstPayment,jdbcType=DECIMAL},
       actually_total_payment = #{record.actuallyTotalPayment,jdbcType=DECIMAL},
       actually_brokerage_amount = #{record.actuallyBrokerageAmount,jdbcType=DECIMAL},
-      delete_sign = #{record.deleteSign,jdbcType=BIT},
       order_status = #{record.orderStatus,jdbcType=INTEGER},
       intention_status = #{record.intentionStatus,jdbcType=INTEGER},
       trading_status = #{record.tradingStatus,jdbcType=INTEGER},
       technology_transfer_progress = #{record.technologyTransferProgress,jdbcType=INTEGER},
       payment_status = #{record.paymentStatus,jdbcType=INTEGER},
       liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
-      order_follow = #{record.orderFollow,jdbcType=VARCHAR},
-      order_channel = #{record.orderChannel,jdbcType=INTEGER}
+      order_follower = #{record.orderFollower,jdbcType=VARCHAR},
+      order_channel = #{record.orderChannel,jdbcType=INTEGER},
+      order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -478,7 +526,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     update t_order
     <set>
@@ -500,14 +548,23 @@
       <if test="commodityId != null">
         commodity_id = #{commodityId,jdbcType=VARCHAR},
       </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
       <if test="commodityType != null">
         commodity_type = #{commodityType,jdbcType=INTEGER},
       </if>
+      <if test="commodityMode != null">
+        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      </if>
       <if test="firstPayment != null">
         first_payment = #{firstPayment,jdbcType=DECIMAL},
       </if>
-      <if test="totalPayment != null">
-        total_payment = #{totalPayment,jdbcType=DECIMAL},
+      <if test="orderAmount != null">
+        order_amount = #{orderAmount,jdbcType=DECIMAL},
       </if>
       <if test="brokerageAmount != null">
         brokerage_amount = #{brokerageAmount,jdbcType=DECIMAL},
@@ -524,9 +581,6 @@
       <if test="actuallyBrokerageAmount != null">
         actually_brokerage_amount = #{actuallyBrokerageAmount,jdbcType=DECIMAL},
       </if>
-      <if test="deleteSign != null">
-        delete_sign = #{deleteSign,jdbcType=BIT},
-      </if>
       <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=INTEGER},
       </if>
@@ -545,12 +599,18 @@
       <if test="liquidationStatus != null">
         liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
       </if>
-      <if test="orderFollow != null">
-        order_follow = #{orderFollow,jdbcType=VARCHAR},
+      <if test="orderFollower != null">
+        order_follower = #{orderFollower,jdbcType=VARCHAR},
       </if>
       <if test="orderChannel != null">
         order_channel = #{orderChannel,jdbcType=INTEGER},
       </if>
+      <if test="orderRemarks != null">
+        order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=BIT},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=BIGINT}
   </update>
@@ -558,7 +618,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 15:43:40 CST 2017.
+      This element was generated on Tue Dec 26 20:46:24 CST 2017.
     -->
     update t_order
     set creater = #{creater,jdbcType=VARCHAR},
@@ -567,23 +627,105 @@
       buyer_id = #{buyerId,jdbcType=VARCHAR},
       seller_id = #{sellerId,jdbcType=VARCHAR},
       commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
       commodity_type = #{commodityType,jdbcType=INTEGER},
+      commodity_mode = #{commodityMode,jdbcType=VARCHAR},
       first_payment = #{firstPayment,jdbcType=DECIMAL},
-      total_payment = #{totalPayment,jdbcType=DECIMAL},
+      order_amount = #{orderAmount,jdbcType=DECIMAL},
       brokerage_amount = #{brokerageAmount,jdbcType=DECIMAL},
       brokerage_proportion = #{brokerageProportion,jdbcType=DECIMAL},
       actually_first_payment = #{actuallyFirstPayment,jdbcType=DECIMAL},
       actually_total_payment = #{actuallyTotalPayment,jdbcType=DECIMAL},
       actually_brokerage_amount = #{actuallyBrokerageAmount,jdbcType=DECIMAL},
-      delete_sign = #{deleteSign,jdbcType=BIT},
       order_status = #{orderStatus,jdbcType=INTEGER},
       intention_status = #{intentionStatus,jdbcType=INTEGER},
       trading_status = #{tradingStatus,jdbcType=INTEGER},
       technology_transfer_progress = #{technologyTransferProgress,jdbcType=INTEGER},
       payment_status = #{paymentStatus,jdbcType=INTEGER},
       liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
-      order_follow = #{orderFollow,jdbcType=VARCHAR},
-      order_channel = #{orderChannel,jdbcType=INTEGER}
+      order_follower = #{orderFollower,jdbcType=VARCHAR},
+      order_channel = #{orderChannel,jdbcType=INTEGER},
+      order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=BIT}
     where order_no = #{orderNo,jdbcType=BIGINT}
   </update>
+  
+  <select id="selectCommodityDetail" resultType="com.goafanti.order.bo.OrderDetailBo">
+  	<choose>
+  		<when test="commodityType == 0">
+  			select id as commodityId,bname as commodityName,ifnull(price,0) as commodityPrice from business_project where id = #{commodityId,jdbcType=VARCHAR}
+  		</when>
+  		<when test="commodityType == 1">
+  			select id as commodityId,name as commodityName,summary as introduction,ifnull(transfer_price,0) as commodityPrice,owner_id as sellerId from achievement where id = #{commodityId,jdbcType=VARCHAR}
+  		</when>
+  		<when test="commodityType == 2">
+  			select id as commodityId,name as commodityName,problem_des as introduction,ifnull(budget_cost,0) as commodityPrice,employer_id as sellerId from demand where id = #{commodityId,jdbcType=VARCHAR}
+  		</when>
+  		<when test="commodityType == 3">
+  			select id as commodityId,nickname as commodityName,introduction,id as sellerId from user where id = #{commodityId,jdbcType=VARCHAR}
+  		</when>
+  		<when test="commodityType == 4">
+  			
+  		</when>
+  		<when test="commodityType == 5">
+  		
+  		</when>
+  	</choose>
+  </select>
+  
+  <select id="selectOrderListByPage" resultMap="BaseResultMap">
+  	select 
+    <include refid="Base_Column_List" />
+    from t_order where delete_sign = 0
+    <choose>
+    	<when test="intentionStatus == 0"><!-- 意向订单 -->
+    		and intention_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    	</when>
+    	<otherwise>
+    		and intention_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
+    	</otherwise>
+    </choose>
+  </select>
+  
+   <select id="selectOrderListCount" resultType="java.lang.Integer">
+  	select 
+  		count(0) 
+  	from t_order where delete_sign = 0
+    <choose>
+    	<when test="intentionStatus == 0"><!-- 意向订单 -->
+    		and intention_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    	</when>
+    	<otherwise>
+    		and intention_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
+    	</otherwise>
+    </choose>
+  </select>
+  
+  <select id="selectFundingHistoryByPage" resultType="com.goafanti.order.bo.FundingListBo">
+	select
+		a.order_no as orderNo,
+		a.create_time as createTime,
+		a.transaction_subject as transactionSubject,
+		b.commodity_type as commodityType
+	from
+		t_funding_records a left join t_order b on a.order_no = b.order_no
+	where
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and delete_sign = 0
+		<if test="orderNo != null and orderNo != ''">
+			a.order_no = #{orderNo,jdbcType=BIGINT}
+		</if>
+  </select>
+  
+  <select id="selectFundingHistoryCount" resultType="java.lang.Integer">
+  	select
+		count(0)
+	from
+		t_funding_records a left join t_order b on a.order_no = b.order_no
+	where
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and delete_sign = 0
+		<if test="orderNo != null and orderNo != ''">
+			a.order_no = #{orderNo,jdbcType=BIGINT}
+		</if>
+  </select>
 </mapper>

+ 0 - 468
src/main/java/com/goafanti/common/model/TFundingRecorders.java

@@ -1,468 +0,0 @@
-package com.goafanti.common.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class TFundingRecorders {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Long id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.order_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Long orderId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.creater
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private String creater;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.create_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.update_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Date updateTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.payee_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private String payeeId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.payer_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private String payerId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.transaction_amount
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private BigDecimal transactionAmount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.transaction_subject
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Integer transactionSubject;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.transaction_channel
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Integer transactionChannel;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.transaction_mode
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Integer transactionMode;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.comments
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private String comments;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.confirm_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Boolean confirmSign;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_funding_recorders.delete_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    private Boolean deleteSign;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.id
-     *
-     * @return the value of t_funding_recorders.id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.id
-     *
-     * @param id the value for t_funding_recorders.id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.order_id
-     *
-     * @return the value of t_funding_recorders.order_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.order_id
-     *
-     * @param orderId the value for t_funding_recorders.order_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.creater
-     *
-     * @return the value of t_funding_recorders.creater
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public String getCreater() {
-        return creater;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.creater
-     *
-     * @param creater the value for t_funding_recorders.creater
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.create_time
-     *
-     * @return the value of t_funding_recorders.create_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.create_time
-     *
-     * @param createTime the value for t_funding_recorders.create_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.update_time
-     *
-     * @return the value of t_funding_recorders.update_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.update_time
-     *
-     * @param updateTime the value for t_funding_recorders.update_time
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.payee_id
-     *
-     * @return the value of t_funding_recorders.payee_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public String getPayeeId() {
-        return payeeId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.payee_id
-     *
-     * @param payeeId the value for t_funding_recorders.payee_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.payer_id
-     *
-     * @return the value of t_funding_recorders.payer_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public String getPayerId() {
-        return payerId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.payer_id
-     *
-     * @param payerId the value for t_funding_recorders.payer_id
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.transaction_amount
-     *
-     * @return the value of t_funding_recorders.transaction_amount
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public BigDecimal getTransactionAmount() {
-        return transactionAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.transaction_amount
-     *
-     * @param transactionAmount the value for t_funding_recorders.transaction_amount
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.transaction_subject
-     *
-     * @return the value of t_funding_recorders.transaction_subject
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Integer getTransactionSubject() {
-        return transactionSubject;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.transaction_subject
-     *
-     * @param transactionSubject the value for t_funding_recorders.transaction_subject
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.transaction_channel
-     *
-     * @return the value of t_funding_recorders.transaction_channel
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Integer getTransactionChannel() {
-        return transactionChannel;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.transaction_channel
-     *
-     * @param transactionChannel the value for t_funding_recorders.transaction_channel
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    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_funding_recorders.transaction_mode
-     *
-     * @return the value of t_funding_recorders.transaction_mode
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Integer getTransactionMode() {
-        return transactionMode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.transaction_mode
-     *
-     * @param transactionMode the value for t_funding_recorders.transaction_mode
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setTransactionMode(Integer transactionMode) {
-        this.transactionMode = transactionMode;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.comments
-     *
-     * @return the value of t_funding_recorders.comments
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public String getComments() {
-        return comments;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.comments
-     *
-     * @param comments the value for t_funding_recorders.comments
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.confirm_sign
-     *
-     * @return the value of t_funding_recorders.confirm_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Boolean getConfirmSign() {
-        return confirmSign;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.confirm_sign
-     *
-     * @param confirmSign the value for t_funding_recorders.confirm_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setConfirmSign(Boolean confirmSign) {
-        this.confirmSign = confirmSign;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_funding_recorders.delete_sign
-     *
-     * @return the value of t_funding_recorders.delete_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public Boolean getDeleteSign() {
-        return deleteSign;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_funding_recorders.delete_sign
-     *
-     * @param deleteSign the value for t_funding_recorders.delete_sign
-     *
-     * @mbg.generated Sat Dec 23 14:28:37 CST 2017
-     */
-    public void setDeleteSign(Boolean deleteSign) {
-        this.deleteSign = deleteSign;
-    }
-}

File diff suppressed because it is too large
+ 0 - 1184
src/main/java/com/goafanti/common/model/TFundingRecordersExample.java


+ 330 - 0
src/main/java/com/goafanti/common/model/TFundingRecords.java

@@ -0,0 +1,330 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TFundingRecords {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.order_no
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Long orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.creater
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private String creater;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.create_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.update_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.payee_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private String payeeId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.payer_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private String payerId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.transaction_amount
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private BigDecimal transactionAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.transaction_subject
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Integer transactionSubject;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.transaction_channel
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Integer transactionChannel;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.transaction_mode
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Integer transactionMode;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.remarks
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.confirm_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Integer confirmSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_funding_records.delete_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	private Boolean deleteSign;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_funding_records.id
+	 * @return  the value of t_funding_records.id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.id
+	 * @param id  the value for t_funding_records.id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_funding_records.order_no
+	 * @return  the value of t_funding_records.order_no
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Long getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.order_no
+	 * @param orderNo  the value for t_funding_records.order_no
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public void setOrderNo(Long orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_funding_records.creater
+	 * @return  the value of t_funding_records.creater
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public String getCreater() {
+		return creater;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.creater
+	 * @param creater  the value for t_funding_records.creater
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.create_time
+	 * @return  the value of t_funding_records.create_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.create_time
+	 * @param createTime  the value for t_funding_records.create_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.update_time
+	 * @return  the value of t_funding_records.update_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.update_time
+	 * @param updateTime  the value for t_funding_records.update_time
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.payee_id
+	 * @return  the value of t_funding_records.payee_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public String getPayeeId() {
+		return payeeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.payee_id
+	 * @param payeeId  the value for t_funding_records.payee_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.payer_id
+	 * @return  the value of t_funding_records.payer_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public String getPayerId() {
+		return payerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.payer_id
+	 * @param payerId  the value for t_funding_records.payer_id
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.transaction_amount
+	 * @return  the value of t_funding_records.transaction_amount
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public BigDecimal getTransactionAmount() {
+		return transactionAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.transaction_amount
+	 * @param transactionAmount  the value for t_funding_records.transaction_amount
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.transaction_subject
+	 * @return  the value of t_funding_records.transaction_subject
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Integer getTransactionSubject() {
+		return transactionSubject;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.transaction_subject
+	 * @param transactionSubject  the value for t_funding_records.transaction_subject
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.transaction_channel
+	 * @return  the value of t_funding_records.transaction_channel
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Integer getTransactionChannel() {
+		return transactionChannel;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.transaction_channel
+	 * @param transactionChannel  the value for t_funding_records.transaction_channel
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.transaction_mode
+	 * @return  the value of t_funding_records.transaction_mode
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Integer getTransactionMode() {
+		return transactionMode;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.transaction_mode
+	 * @param transactionMode  the value for t_funding_records.transaction_mode
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public void setTransactionMode(Integer transactionMode) {
+		this.transactionMode = transactionMode;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_funding_records.remarks
+	 * @return  the value of t_funding_records.remarks
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.remarks
+	 * @param remarks  the value for t_funding_records.remarks
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.confirm_sign
+	 * @return  the value of t_funding_records.confirm_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Integer getConfirmSign() {
+		return confirmSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.confirm_sign
+	 * @param confirmSign  the value for t_funding_records.confirm_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	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_funding_records.delete_sign
+	 * @return  the value of t_funding_records.delete_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public Boolean getDeleteSign() {
+		return deleteSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_funding_records.delete_sign
+	 * @param deleteSign  the value for t_funding_records.delete_sign
+	 * @mbg.generated  Tue Dec 26 11:19:48 CST 2017
+	 */
+	public void setDeleteSign(Boolean deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+}

File diff suppressed because it is too large
+ 1153 - 0
src/main/java/com/goafanti/common/model/TFundingRecordsExample.java


+ 204 - 112
src/main/java/com/goafanti/common/model/TOrder.java

@@ -7,129 +7,149 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Long orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.create_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.update_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.buyer_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private String buyerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.seller_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private String sellerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private String commodityId;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_quantity
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	private Integer commodityQuantity;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_price
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	private BigDecimal commodityPrice;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_type
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer commodityType;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_mode
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	private String commodityMode;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal firstPayment;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_amount
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	private BigDecimal totalPayment;
+	private BigDecimal orderAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal brokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_proportion
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal brokerageProportion;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal actuallyFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal actuallyTotalPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private BigDecimal actuallyBrokerageAmount;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.delete_sign
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
-	 */
-	private Boolean deleteSign;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer orderStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.intention_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer intentionStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.trading_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer tradingStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.technology_transfer_progress
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer technologyTransferProgress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.payment_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer paymentStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.liquidation_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer liquidationStatus;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_follow
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_follower
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	private String orderFollow;
+	private String orderFollower;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_channel
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	private Integer orderChannel;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_remarks
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	private String orderRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.delete_sign
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	private Boolean deleteSign;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_no
 	 * @return  the value of t_order.order_no
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Long getOrderNo() {
 		return orderNo;
@@ -138,7 +158,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_no
 	 * @param orderNo  the value for t_order.order_no
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setOrderNo(Long orderNo) {
 		this.orderNo = orderNo;
@@ -147,7 +167,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.creater
 	 * @return  the value of t_order.creater
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public String getCreater() {
 		return creater;
@@ -156,7 +176,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.creater
 	 * @param creater  the value for t_order.creater
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -165,7 +185,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.create_time
 	 * @return  the value of t_order.create_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -174,7 +194,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.create_time
 	 * @param createTime  the value for t_order.create_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -183,7 +203,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.update_time
 	 * @return  the value of t_order.update_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -192,7 +212,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.update_time
 	 * @param updateTime  the value for t_order.update_time
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -201,7 +221,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.buyer_id
 	 * @return  the value of t_order.buyer_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -210,7 +230,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.buyer_id
 	 * @param buyerId  the value for t_order.buyer_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -219,7 +239,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.seller_id
 	 * @return  the value of t_order.seller_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -228,7 +248,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.seller_id
 	 * @param sellerId  the value for t_order.seller_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -237,7 +257,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.commodity_id
 	 * @return  the value of t_order.commodity_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -246,16 +266,52 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_id
 	 * @param commodityId  the value for t_order.commodity_id
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.commodity_quantity
+	 * @return  the value of t_order.commodity_quantity
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public Integer getCommodityQuantity() {
+		return commodityQuantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_quantity
+	 * @param commodityQuantity  the value for t_order.commodity_quantity
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public void setCommodityQuantity(Integer commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.commodity_price
+	 * @return  the value of t_order.commodity_price
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public BigDecimal getCommodityPrice() {
+		return commodityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_price
+	 * @param commodityPrice  the value for t_order.commodity_price
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public void setCommodityPrice(BigDecimal commodityPrice) {
+		this.commodityPrice = commodityPrice;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.commodity_type
 	 * @return  the value of t_order.commodity_type
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getCommodityType() {
 		return commodityType;
@@ -264,16 +320,34 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_type
 	 * @param commodityType  the value for t_order.commodity_type
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.commodity_mode
+	 * @return  the value of t_order.commodity_mode
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public String getCommodityMode() {
+		return commodityMode;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_mode
+	 * @param commodityMode  the value for t_order.commodity_mode
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public void setCommodityMode(String commodityMode) {
+		this.commodityMode = commodityMode;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.first_payment
 	 * @return  the value of t_order.first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -282,34 +356,34 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.first_payment
 	 * @param firstPayment  the value for t_order.first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.total_payment
-	 * @return  the value of t_order.total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_amount
+	 * @return  the value of t_order.order_amount
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	public BigDecimal getTotalPayment() {
-		return totalPayment;
+	public BigDecimal getOrderAmount() {
+		return orderAmount;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.total_payment
-	 * @param totalPayment  the value for t_order.total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_amount
+	 * @param orderAmount  the value for t_order.order_amount
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	public void setTotalPayment(BigDecimal totalPayment) {
-		this.totalPayment = totalPayment;
+	public void setOrderAmount(BigDecimal orderAmount) {
+		this.orderAmount = orderAmount;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.brokerage_amount
 	 * @return  the value of t_order.brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -318,7 +392,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.brokerage_amount
 	 * @param brokerageAmount  the value for t_order.brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -327,7 +401,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.brokerage_proportion
 	 * @return  the value of t_order.brokerage_proportion
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getBrokerageProportion() {
 		return brokerageProportion;
@@ -336,7 +410,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.brokerage_proportion
 	 * @param brokerageProportion  the value for t_order.brokerage_proportion
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setBrokerageProportion(BigDecimal brokerageProportion) {
 		this.brokerageProportion = brokerageProportion;
@@ -345,7 +419,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_first_payment
 	 * @return  the value of t_order.actually_first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -354,7 +428,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_first_payment
 	 * @param actuallyFirstPayment  the value for t_order.actually_first_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -363,7 +437,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_total_payment
 	 * @return  the value of t_order.actually_total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getActuallyTotalPayment() {
 		return actuallyTotalPayment;
@@ -372,7 +446,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_total_payment
 	 * @param actuallyTotalPayment  the value for t_order.actually_total_payment
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setActuallyTotalPayment(BigDecimal actuallyTotalPayment) {
 		this.actuallyTotalPayment = actuallyTotalPayment;
@@ -381,7 +455,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_brokerage_amount
 	 * @return  the value of t_order.actually_brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -390,34 +464,16 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_brokerage_amount
 	 * @param actuallyBrokerageAmount  the value for t_order.actually_brokerage_amount
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.delete_sign
-	 * @return  the value of t_order.delete_sign
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
-	 */
-	public Boolean getDeleteSign() {
-		return deleteSign;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.delete_sign
-	 * @param deleteSign  the value for t_order.delete_sign
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
-	 */
-	public void setDeleteSign(Boolean deleteSign) {
-		this.deleteSign = deleteSign;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_status
 	 * @return  the value of t_order.order_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -426,7 +482,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_status
 	 * @param orderStatus  the value for t_order.order_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -435,7 +491,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.intention_status
 	 * @return  the value of t_order.intention_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getIntentionStatus() {
 		return intentionStatus;
@@ -444,7 +500,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.intention_status
 	 * @param intentionStatus  the value for t_order.intention_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setIntentionStatus(Integer intentionStatus) {
 		this.intentionStatus = intentionStatus;
@@ -453,7 +509,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.trading_status
 	 * @return  the value of t_order.trading_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getTradingStatus() {
 		return tradingStatus;
@@ -462,7 +518,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.trading_status
 	 * @param tradingStatus  the value for t_order.trading_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setTradingStatus(Integer tradingStatus) {
 		this.tradingStatus = tradingStatus;
@@ -471,7 +527,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.technology_transfer_progress
 	 * @return  the value of t_order.technology_transfer_progress
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getTechnologyTransferProgress() {
 		return technologyTransferProgress;
@@ -480,7 +536,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.technology_transfer_progress
 	 * @param technologyTransferProgress  the value for t_order.technology_transfer_progress
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setTechnologyTransferProgress(Integer technologyTransferProgress) {
 		this.technologyTransferProgress = technologyTransferProgress;
@@ -489,7 +545,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.payment_status
 	 * @return  the value of t_order.payment_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getPaymentStatus() {
 		return paymentStatus;
@@ -498,7 +554,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.payment_status
 	 * @param paymentStatus  the value for t_order.payment_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setPaymentStatus(Integer paymentStatus) {
 		this.paymentStatus = paymentStatus;
@@ -507,7 +563,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.liquidation_status
 	 * @return  the value of t_order.liquidation_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -516,34 +572,34 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.liquidation_status
 	 * @param liquidationStatus  the value for t_order.liquidation_status
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_follow
-	 * @return  the value of t_order.order_follow
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_follower
+	 * @return  the value of t_order.order_follower
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	public String getOrderFollow() {
-		return orderFollow;
+	public String getOrderFollower() {
+		return orderFollower;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_follow
-	 * @param orderFollow  the value for t_order.order_follow
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_follower
+	 * @param orderFollower  the value for t_order.order_follower
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
-	public void setOrderFollow(String orderFollow) {
-		this.orderFollow = orderFollow;
+	public void setOrderFollower(String orderFollower) {
+		this.orderFollower = orderFollower;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_channel
 	 * @return  the value of t_order.order_channel
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -552,9 +608,45 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_channel
 	 * @param orderChannel  the value for t_order.order_channel
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_remarks
+	 * @return  the value of t_order.order_remarks
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public String getOrderRemarks() {
+		return orderRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_remarks
+	 * @param orderRemarks  the value for t_order.order_remarks
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public void setOrderRemarks(String orderRemarks) {
+		this.orderRemarks = orderRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.delete_sign
+	 * @return  the value of t_order.delete_sign
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public Boolean getDeleteSign() {
+		return deleteSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.delete_sign
+	 * @param deleteSign  the value for t_order.delete_sign
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 */
+	public void setDeleteSign(Boolean deleteSign) {
+		this.deleteSign = deleteSign;
+	}
 }

+ 388 - 128
src/main/java/com/goafanti/common/model/TOrderExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public TOrderExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -624,6 +624,126 @@ public class TOrderExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andCommodityQuantityIsNull() {
+			addCriterion("commodity_quantity is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityIsNotNull() {
+			addCriterion("commodity_quantity is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityEqualTo(Integer value) {
+			addCriterion("commodity_quantity =", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotEqualTo(Integer value) {
+			addCriterion("commodity_quantity <>", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityGreaterThan(Integer value) {
+			addCriterion("commodity_quantity >", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityGreaterThanOrEqualTo(Integer value) {
+			addCriterion("commodity_quantity >=", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityLessThan(Integer value) {
+			addCriterion("commodity_quantity <", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityLessThanOrEqualTo(Integer value) {
+			addCriterion("commodity_quantity <=", value, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityIn(List<Integer> values) {
+			addCriterion("commodity_quantity in", values, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotIn(List<Integer> values) {
+			addCriterion("commodity_quantity not in", values, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityBetween(Integer value1, Integer value2) {
+			addCriterion("commodity_quantity between", value1, value2, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityQuantityNotBetween(Integer value1, Integer value2) {
+			addCriterion("commodity_quantity not between", value1, value2, "commodityQuantity");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIsNull() {
+			addCriterion("commodity_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIsNotNull() {
+			addCriterion("commodity_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceEqualTo(BigDecimal value) {
+			addCriterion("commodity_price =", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotEqualTo(BigDecimal value) {
+			addCriterion("commodity_price <>", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceGreaterThan(BigDecimal value) {
+			addCriterion("commodity_price >", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("commodity_price >=", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceLessThan(BigDecimal value) {
+			addCriterion("commodity_price <", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("commodity_price <=", value, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceIn(List<BigDecimal> values) {
+			addCriterion("commodity_price in", values, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotIn(List<BigDecimal> values) {
+			addCriterion("commodity_price not in", values, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("commodity_price between", value1, value2, "commodityPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("commodity_price not between", value1, value2, "commodityPrice");
+			return (Criteria) this;
+		}
+
 		public Criteria andCommodityTypeIsNull() {
 			addCriterion("commodity_type is null");
 			return (Criteria) this;
@@ -684,6 +804,76 @@ public class TOrderExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andCommodityModeIsNull() {
+			addCriterion("commodity_mode is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeIsNotNull() {
+			addCriterion("commodity_mode is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeEqualTo(String value) {
+			addCriterion("commodity_mode =", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeNotEqualTo(String value) {
+			addCriterion("commodity_mode <>", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeGreaterThan(String value) {
+			addCriterion("commodity_mode >", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeGreaterThanOrEqualTo(String value) {
+			addCriterion("commodity_mode >=", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeLessThan(String value) {
+			addCriterion("commodity_mode <", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeLessThanOrEqualTo(String value) {
+			addCriterion("commodity_mode <=", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeLike(String value) {
+			addCriterion("commodity_mode like", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeNotLike(String value) {
+			addCriterion("commodity_mode not like", value, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeIn(List<String> values) {
+			addCriterion("commodity_mode in", values, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeNotIn(List<String> values) {
+			addCriterion("commodity_mode not in", values, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeBetween(String value1, String value2) {
+			addCriterion("commodity_mode between", value1, value2, "commodityMode");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityModeNotBetween(String value1, String value2) {
+			addCriterion("commodity_mode not between", value1, value2, "commodityMode");
+			return (Criteria) this;
+		}
+
 		public Criteria andFirstPaymentIsNull() {
 			addCriterion("first_payment is null");
 			return (Criteria) this;
@@ -744,63 +934,63 @@ public class TOrderExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentIsNull() {
-			addCriterion("total_payment is null");
+		public Criteria andOrderAmountIsNull() {
+			addCriterion("order_amount is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentIsNotNull() {
-			addCriterion("total_payment is not null");
+		public Criteria andOrderAmountIsNotNull() {
+			addCriterion("order_amount is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentEqualTo(BigDecimal value) {
-			addCriterion("total_payment =", value, "totalPayment");
+		public Criteria andOrderAmountEqualTo(BigDecimal value) {
+			addCriterion("order_amount =", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentNotEqualTo(BigDecimal value) {
-			addCriterion("total_payment <>", value, "totalPayment");
+		public Criteria andOrderAmountNotEqualTo(BigDecimal value) {
+			addCriterion("order_amount <>", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentGreaterThan(BigDecimal value) {
-			addCriterion("total_payment >", value, "totalPayment");
+		public Criteria andOrderAmountGreaterThan(BigDecimal value) {
+			addCriterion("order_amount >", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentGreaterThanOrEqualTo(BigDecimal value) {
-			addCriterion("total_payment >=", value, "totalPayment");
+		public Criteria andOrderAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_amount >=", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentLessThan(BigDecimal value) {
-			addCriterion("total_payment <", value, "totalPayment");
+		public Criteria andOrderAmountLessThan(BigDecimal value) {
+			addCriterion("order_amount <", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentLessThanOrEqualTo(BigDecimal value) {
-			addCriterion("total_payment <=", value, "totalPayment");
+		public Criteria andOrderAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("order_amount <=", value, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentIn(List<BigDecimal> values) {
-			addCriterion("total_payment in", values, "totalPayment");
+		public Criteria andOrderAmountIn(List<BigDecimal> values) {
+			addCriterion("order_amount in", values, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentNotIn(List<BigDecimal> values) {
-			addCriterion("total_payment not in", values, "totalPayment");
+		public Criteria andOrderAmountNotIn(List<BigDecimal> values) {
+			addCriterion("order_amount not in", values, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentBetween(BigDecimal value1, BigDecimal value2) {
-			addCriterion("total_payment between", value1, value2, "totalPayment");
+		public Criteria andOrderAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_amount between", value1, value2, "orderAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalPaymentNotBetween(BigDecimal value1, BigDecimal value2) {
-			addCriterion("total_payment not between", value1, value2, "totalPayment");
+		public Criteria andOrderAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("order_amount not between", value1, value2, "orderAmount");
 			return (Criteria) this;
 		}
 
@@ -1104,66 +1294,6 @@ public class TOrderExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignIsNull() {
-			addCriterion("delete_sign is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignIsNotNull() {
-			addCriterion("delete_sign is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignEqualTo(Boolean value) {
-			addCriterion("delete_sign =", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignNotEqualTo(Boolean value) {
-			addCriterion("delete_sign <>", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignGreaterThan(Boolean value) {
-			addCriterion("delete_sign >", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignGreaterThanOrEqualTo(Boolean value) {
-			addCriterion("delete_sign >=", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignLessThan(Boolean value) {
-			addCriterion("delete_sign <", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignLessThanOrEqualTo(Boolean value) {
-			addCriterion("delete_sign <=", value, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignIn(List<Boolean> values) {
-			addCriterion("delete_sign in", values, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignNotIn(List<Boolean> values) {
-			addCriterion("delete_sign not in", values, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignBetween(Boolean value1, Boolean value2) {
-			addCriterion("delete_sign between", value1, value2, "deleteSign");
-			return (Criteria) this;
-		}
-
-		public Criteria andDeleteSignNotBetween(Boolean value1, Boolean value2) {
-			addCriterion("delete_sign not between", value1, value2, "deleteSign");
-			return (Criteria) this;
-		}
-
 		public Criteria andOrderStatusIsNull() {
 			addCriterion("order_status is null");
 			return (Criteria) this;
@@ -1524,73 +1654,73 @@ public class TOrderExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowIsNull() {
-			addCriterion("order_follow is null");
+		public Criteria andOrderFollowerIsNull() {
+			addCriterion("order_follower is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowIsNotNull() {
-			addCriterion("order_follow is not null");
+		public Criteria andOrderFollowerIsNotNull() {
+			addCriterion("order_follower is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowEqualTo(String value) {
-			addCriterion("order_follow =", value, "orderFollow");
+		public Criteria andOrderFollowerEqualTo(String value) {
+			addCriterion("order_follower =", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowNotEqualTo(String value) {
-			addCriterion("order_follow <>", value, "orderFollow");
+		public Criteria andOrderFollowerNotEqualTo(String value) {
+			addCriterion("order_follower <>", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowGreaterThan(String value) {
-			addCriterion("order_follow >", value, "orderFollow");
+		public Criteria andOrderFollowerGreaterThan(String value) {
+			addCriterion("order_follower >", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowGreaterThanOrEqualTo(String value) {
-			addCriterion("order_follow >=", value, "orderFollow");
+		public Criteria andOrderFollowerGreaterThanOrEqualTo(String value) {
+			addCriterion("order_follower >=", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowLessThan(String value) {
-			addCriterion("order_follow <", value, "orderFollow");
+		public Criteria andOrderFollowerLessThan(String value) {
+			addCriterion("order_follower <", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowLessThanOrEqualTo(String value) {
-			addCriterion("order_follow <=", value, "orderFollow");
+		public Criteria andOrderFollowerLessThanOrEqualTo(String value) {
+			addCriterion("order_follower <=", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowLike(String value) {
-			addCriterion("order_follow like", value, "orderFollow");
+		public Criteria andOrderFollowerLike(String value) {
+			addCriterion("order_follower like", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowNotLike(String value) {
-			addCriterion("order_follow not like", value, "orderFollow");
+		public Criteria andOrderFollowerNotLike(String value) {
+			addCriterion("order_follower not like", value, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowIn(List<String> values) {
-			addCriterion("order_follow in", values, "orderFollow");
+		public Criteria andOrderFollowerIn(List<String> values) {
+			addCriterion("order_follower in", values, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowNotIn(List<String> values) {
-			addCriterion("order_follow not in", values, "orderFollow");
+		public Criteria andOrderFollowerNotIn(List<String> values) {
+			addCriterion("order_follower not in", values, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowBetween(String value1, String value2) {
-			addCriterion("order_follow between", value1, value2, "orderFollow");
+		public Criteria andOrderFollowerBetween(String value1, String value2) {
+			addCriterion("order_follower between", value1, value2, "orderFollower");
 			return (Criteria) this;
 		}
 
-		public Criteria andOrderFollowNotBetween(String value1, String value2) {
-			addCriterion("order_follow not between", value1, value2, "orderFollow");
+		public Criteria andOrderFollowerNotBetween(String value1, String value2) {
+			addCriterion("order_follower not between", value1, value2, "orderFollower");
 			return (Criteria) this;
 		}
 
@@ -1653,11 +1783,141 @@ public class TOrderExample {
 			addCriterion("order_channel not between", value1, value2, "orderChannel");
 			return (Criteria) this;
 		}
+
+		public Criteria andOrderRemarksIsNull() {
+			addCriterion("order_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksIsNotNull() {
+			addCriterion("order_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksEqualTo(String value) {
+			addCriterion("order_remarks =", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksNotEqualTo(String value) {
+			addCriterion("order_remarks <>", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksGreaterThan(String value) {
+			addCriterion("order_remarks >", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("order_remarks >=", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksLessThan(String value) {
+			addCriterion("order_remarks <", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksLessThanOrEqualTo(String value) {
+			addCriterion("order_remarks <=", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksLike(String value) {
+			addCriterion("order_remarks like", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksNotLike(String value) {
+			addCriterion("order_remarks not like", value, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksIn(List<String> values) {
+			addCriterion("order_remarks in", values, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksNotIn(List<String> values) {
+			addCriterion("order_remarks not in", values, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksBetween(String value1, String value2) {
+			addCriterion("order_remarks between", value1, value2, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderRemarksNotBetween(String value1, String value2) {
+			addCriterion("order_remarks not between", value1, value2, "orderRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIsNull() {
+			addCriterion("delete_sign is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIsNotNull() {
+			addCriterion("delete_sign is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignEqualTo(Boolean value) {
+			addCriterion("delete_sign =", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotEqualTo(Boolean value) {
+			addCriterion("delete_sign <>", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignGreaterThan(Boolean value) {
+			addCriterion("delete_sign >", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignGreaterThanOrEqualTo(Boolean value) {
+			addCriterion("delete_sign >=", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignLessThan(Boolean value) {
+			addCriterion("delete_sign <", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignLessThanOrEqualTo(Boolean value) {
+			addCriterion("delete_sign <=", value, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignIn(List<Boolean> values) {
+			addCriterion("delete_sign in", values, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotIn(List<Boolean> values) {
+			addCriterion("delete_sign not in", values, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignBetween(Boolean value1, Boolean value2) {
+			addCriterion("delete_sign between", value1, value2, "deleteSign");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeleteSignNotBetween(Boolean value1, Boolean value2) {
+			addCriterion("delete_sign not between", value1, value2, "deleteSign");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Sat Dec 23 15:43:40 CST 2017
+	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 185 - 0
src/main/java/com/goafanti/common/utils/DecimalCalculate.java

@@ -0,0 +1,185 @@
+package com.goafanti.common.utils;
+
+import java.math.BigDecimal;
+
+public class DecimalCalculate {
+	// 默认除法运算精度
+	private static final int DEF_DIV_SCALE = 10;
+
+	/**
+	 * 提供精确的加法运算。
+	 * 
+	 * @param v1
+	 *            被加数
+	 * @param v2
+	 *            加数
+	 * @return 两个参数的和
+	 */
+	public static double add(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(Double.toString(v1));
+		BigDecimal b2 = new BigDecimal(Double.toString(v2));
+		return b1.add(b2).doubleValue();
+	}
+
+	/**
+	 * 提供精确的减法运算。
+	 * 
+	 * @param v1
+	 *            被减数
+	 * @param v2
+	 *            减数
+	 * @return 两个参数的差
+	 */
+	public static double sub(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(Double.toString(v1));
+		BigDecimal b2 = new BigDecimal(Double.toString(v2));
+		return b1.subtract(b2).doubleValue();
+	}
+
+	/**
+	 * 提供精确的乘法运算。
+	 * 
+	 * @param v1
+	 *            被乘数
+	 * @param v2
+	 *            乘数
+	 * @return 两个参数的积
+	 */
+	public static double mul(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(Double.toString(v1));
+		BigDecimal b2 = new BigDecimal(Double.toString(v2));
+		return b1.multiply(b2).doubleValue();
+	}
+
+	/**
+	 * 提供(相对)精确的除法运算,当发生除不尽的情况时,精确到 小数点以后10位,以后的数字四舍五入。
+	 * 
+	 * @param v1
+	 *            被除数
+	 * @param v2
+	 *            除数
+	 * @return 两个参数的商
+	 */
+	public static double div(double v1, double v2) {
+		return div(v1, v2, DEF_DIV_SCALE);
+	}
+
+	/**
+	 * 提供(相对)精确的除法运算。当发生除不尽的情况时,由scale参数指 定精度,以后的数字四舍五入。
+	 * 
+	 * @param v1
+	 *            被除数
+	 * @param v2
+	 *            除数
+	 * @param scale
+	 *            表示表示需要精确到小数点以后几位。
+	 * @return 两个参数的商
+	 */
+	public static double div(double v1, double v2, int scale) {
+		if (scale < 0) {
+			throw new IllegalArgumentException("The scale must be a positive integer or zero");
+		}
+		BigDecimal b1 = new BigDecimal(Double.toString(v1));
+		BigDecimal b2 = new BigDecimal(Double.toString(v2));
+		return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+	}
+
+	/**
+	 * 提供精确的小数位四舍五入处理。
+	 * 
+	 * @param v
+	 *            需要四舍五入的数字
+	 * @param scale
+	 *            小数点后保留几位
+	 * @return 四舍五入后的结果
+	 */
+	public static double round(double v, int scale) {
+		if (scale < 0) {
+			throw new IllegalArgumentException("The scale must be a positive integer or zero");
+		}
+		BigDecimal b = new BigDecimal(Double.toString(v));
+		BigDecimal one = new BigDecimal("1");
+		return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+	}
+
+	/**
+	 * 提供精确的类型转换(Float)
+	 * 
+	 * @param v
+	 *            需要被转换的数字
+	 * @return 返回转换结果
+	 */
+	public static float convertsToFloat(double v) {
+		BigDecimal b = new BigDecimal(v);
+		return b.floatValue();
+	}
+
+	/**
+	 * 提供精确的类型转换(Int)不进行四舍五入
+	 * 
+	 * @param v
+	 *            需要被转换的数字
+	 * @return 返回转换结果
+	 */
+	public static int convertsToInt(double v) {
+		BigDecimal b = new BigDecimal(v);
+		return b.intValue();
+	}
+
+	/**
+	 * 提供精确的类型转换(Long)
+	 * 
+	 * @param v
+	 *            需要被转换的数字
+	 * @return 返回转换结果
+	 */
+	public static long convertsToLong(double v) {
+		BigDecimal b = new BigDecimal(v);
+		return b.longValue();
+	}
+
+	/**
+	 * 返回两个数中大的一个值
+	 * 
+	 * @param v1
+	 *            需要被对比的第一个数
+	 * @param v2
+	 *            需要被对比的第二个数
+	 * @return 返回两个数中大的一个值
+	 */
+	public static double returnMax(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(v1);
+		BigDecimal b2 = new BigDecimal(v2);
+		return b1.max(b2).doubleValue();
+	}
+
+	/**
+	 * 返回两个数中小的一个值
+	 * 
+	 * @param v1
+	 *            需要被对比的第一个数
+	 * @param v2
+	 *            需要被对比的第二个数
+	 * @return 返回两个数中小的一个值
+	 */
+	public static double returnMin(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(v1);
+		BigDecimal b2 = new BigDecimal(v2);
+		return b1.min(b2).doubleValue();
+	}
+
+	/**
+	 * 精确对比两个数字
+	 * 
+	 * @param v1
+	 *            需要被对比的第一个数
+	 * @param v2
+	 *            需要被对比的第二个数
+	 * @return 如果两个数一样则返回0,如果第一个数比第二个数大则返回1,反之返回-1
+	 */
+	public static int compareTo(double v1, double v2) {
+		BigDecimal b1 = new BigDecimal(v1);
+		BigDecimal b2 = new BigDecimal(v2);
+		return b1.compareTo(b2);
+	}
+}

+ 60 - 0
src/main/java/com/goafanti/order/bo/FundingListBo.java

@@ -0,0 +1,60 @@
+package com.goafanti.order.bo;
+
+public class FundingListBo {
+	/** 订单编号 **/
+	private String orderNo;
+	/** 商品id **/
+	private String commodityId;
+	/** 商品名称 **/
+	private String commodityName;
+	/** 商品类型 **/
+	private Integer commodityType;
+	/** 支付流水时间 **/
+	private String createTime;
+	/** 交易科目 **/
+	private Integer transactionSubject;
+	/** 业务描述  收入 与 支出**/
+	private String businessDesc;
+	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;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+	public Integer getTransactionSubject() {
+		return transactionSubject;
+	}
+	public void setTransactionSubject(Integer transactionSubject) {
+		this.transactionSubject = transactionSubject;
+	}
+	public String getBusinessDesc() {
+		return businessDesc;
+	}
+	public void setBusinessDesc(String businessDesc) {
+		this.businessDesc = businessDesc;
+	}
+}

+ 81 - 0
src/main/java/com/goafanti/order/bo/OperatorActive.java

@@ -0,0 +1,81 @@
+package com.goafanti.order.bo;
+
+/**
+ * 设置用户和管理员可操作选项
+ *
+ */
+public class OperatorActive {
+	/** 意向订单确认 **/
+	private boolean confirmIntention;
+	/** 支付首付 **/
+	private boolean payForFirst; 
+	/** 确认支付首付 **/
+	private boolean confirmPayForFirst; 
+	/** 支付尾款 **/
+	private boolean payForLast; 
+	/** 确认支付尾款 **/
+	private boolean confirmPayForLast;
+	/** 申请取消 **/
+	private boolean applyForCancel; 
+	/** 确认退款 **/
+	private boolean confirmRefund;
+	/** 申请提现 **/
+	private boolean applyForWithdraw;
+	/** 确认提现 **/
+	private boolean confirmWithdraw;
+	
+	public boolean isConfirmIntention() {
+		return confirmIntention;
+	}
+	public void setConfirmIntention(boolean confirmIntention) {
+		this.confirmIntention = confirmIntention;
+	}
+	public boolean isPayForFirst() {
+		return payForFirst;
+	}
+	public void setPayForFirst(boolean payForFirst) {
+		this.payForFirst = payForFirst;
+	}
+	public boolean isConfirmPayForFirst() {
+		return confirmPayForFirst;
+	}
+	public void setConfirmPayForFirst(boolean confirmPayForFirst) {
+		this.confirmPayForFirst = confirmPayForFirst;
+	}
+	public boolean isPayForLast() {
+		return payForLast;
+	}
+	public void setPayForLast(boolean payForLast) {
+		this.payForLast = payForLast;
+	}
+	public boolean isConfirmPayForLast() {
+		return confirmPayForLast;
+	}
+	public void setConfirmPayForLast(boolean confirmPayForLast) {
+		this.confirmPayForLast = confirmPayForLast;
+	}
+	public boolean isApplyForCancel() {
+		return applyForCancel;
+	}
+	public void setApplyForCancel(boolean applyForCancel) {
+		this.applyForCancel = applyForCancel;
+	}
+	public boolean isConfirmRefund() {
+		return confirmRefund;
+	}
+	public void setConfirmRefund(boolean confirmRefund) {
+		this.confirmRefund = confirmRefund;
+	}
+	public boolean isApplyForWithdraw() {
+		return applyForWithdraw;
+	}
+	public void setApplyForWithdraw(boolean applyForWithdraw) {
+		this.applyForWithdraw = applyForWithdraw;
+	}
+	public boolean isConfirmWithdraw() {
+		return confirmWithdraw;
+	}
+	public void setConfirmWithdraw(boolean confirmWithdraw) {
+		this.confirmWithdraw = confirmWithdraw;
+	}
+}

+ 34 - 18
src/main/java/com/goafanti/order/bo/OrderDetailBo.java

@@ -15,18 +15,22 @@ public class OrderDetailBo {
 	private String commodityMode;
 	/** 首付金 **/
 	private String firstPayment;
-	/** 订单类型 **/
-	private Integer orderType;
+	/** 商品类型 **/
+	private Integer commodityType;
 	/** 订单创建时间 **/
 	private String createTime;
 	/** 订单金额 **/
 	private String orderAmount;
 	/** 订单留言 **/
 	private String orderRemarks;
-	/** 技术类型 **/
-	private Integer technologyType;
-	/** 交意方式 **/
-	private Integer transferMode;
+	/** 商品简介 **/
+	private String introduction;
+	/** 卖方id **/
+	private String sellerId;
+	/** 订单状态 **/
+	private String orderStatus;
+	/** 可操作订单 **/
+	private OperatorActive operatorActive;
 	public String getOrderNo() {
 		return orderNo;
 	}
@@ -69,11 +73,11 @@ public class OrderDetailBo {
 	public void setFirstPayment(String firstPayment) {
 		this.firstPayment = firstPayment;
 	}
-	public Integer getOrderType() {
-		return orderType;
+	public Integer getCommodityType() {
+		return commodityType;
 	}
-	public void setOrderType(Integer orderType) {
-		this.orderType = orderType;
+	public void setCommodityType(Integer commodityType) {
+		this.commodityType = commodityType;
 	}
 	public String getCreateTime() {
 		return createTime;
@@ -93,16 +97,28 @@ public class OrderDetailBo {
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
 	}
-	public Integer getTechnologyType() {
-		return technologyType;
+	public String getIntroduction() {
+		return introduction;
 	}
-	public void setTechnologyType(Integer technologyType) {
-		this.technologyType = technologyType;
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
 	}
-	public Integer getTransferMode() {
-		return transferMode;
+	public String getSellerId() {
+		return sellerId;
 	}
-	public void setTransferMode(Integer transferMode) {
-		this.transferMode = transferMode;
+	public void setSellerId(String sellerId) {
+		this.sellerId = sellerId;
+	}
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public OperatorActive getOperatorActive() {
+		return operatorActive;
+	}
+	public void setOperatorActive(OperatorActive operatorActive) {
+		this.operatorActive = operatorActive;
 	}
 }

+ 0 - 5
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -1,5 +0,0 @@
-package com.goafanti.order.bo;
-
-public class OrderListBo {
-
-}

+ 147 - 12
src/main/java/com/goafanti/order/controller/OrderController.java

@@ -1,17 +1,28 @@
 package com.goafanti.order.controller;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 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.order.bo.OrderDetailBo;
+import com.goafanti.order.enums.CommodityType;
+import com.goafanti.order.service.OrderService;
 
 
 @RestController
 @RequestMapping(value = "/api/user/order")
 public class OrderController extends CertifyApiController{
+	
+	@Resource
+	private OrderService orderServiceImpl;
 	/**
 	 * 进入添加意向订单
 	 * @param commodityId 商品编号
@@ -21,18 +32,64 @@ public class OrderController extends CertifyApiController{
 	@RequestMapping(value = "/toAddIntention" , method = RequestMethod.GET)
 	public Result toAddIntention(String commodityId,Integer orderType){
 		Result res = new Result();
+		if(StringUtils.isBlank(commodityId) || null == orderType){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"",""));
+			return res;
+		}
+		if(!CommodityType.containsType(orderType)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单类型错误"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectCommodityDetail(commodityId, orderType));
 		return res;
 	}
 	
 	/**
 	 * 添加意向订单
-	 * @param bo
-	 * @param orderChannel
-	 * @return
+	 * @param orderNo 订单编号
+	 * @param commodityId 商品id
+	 * @param commodityMode 商品规格
+	 * @param createTime 创建时间
+	 * @param commodityQuantity 商品数量
+	 * @param commodityType 商品类型
+	 * @return 
+	 * @throws ParseException 
+	 * @throws NumberFormatException 
 	 */
 	@RequestMapping(value = "/addIntention" , method = RequestMethod.POST)
-	public Result addIntention(OrderDetailBo bo,Integer orderChannel) {
+	public Result addIntention(String orderNo,String commodityId,String commodityMode,Integer commodityQuantity,Integer commodityType,
+			String createTime,String remarks) throws NumberFormatException, ParseException {
 		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(commodityId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品id"));
+			return res;
+		}
+
+		if(StringUtils.isBlank(commodityMode)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品规格"));
+			return res;
+		}
+		if(StringUtils.isBlank(createTime)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单时间"));
+			return res;
+		}
+		if(commodityQuantity == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单数量"));
+			return res;
+		}
+		if(commodityType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
+			return res;
+		}
+		if(!CommodityType.containsType(commodityType)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单类型"));
+			return res;
+		}
+		orderServiceImpl.addIntention(Long.valueOf(orderNo),commodityId,commodityMode,commodityQuantity,commodityType,createTime,remarks);
 		return res;
 	}
 	
@@ -41,8 +98,10 @@ public class OrderController extends CertifyApiController{
 	 * @param confirm  我的意向-false 我的订单 - true
 	 * @return
 	 */
-	public Result orderList(boolean confirm) {
+	@RequestMapping(value = "/orderList", method = RequestMethod.POST)
+	public Result orderList(boolean confirm,Integer pageNo,Integer pageSize) {
 		Result res = new Result();
+		res.setData(orderServiceImpl.selectOrderList(confirm,pageNo,pageSize));
 		return res;
 	}
 	
@@ -50,28 +109,104 @@ public class OrderController extends CertifyApiController{
 	 * 查看订单详情
 	 * @return
 	 */
+	@RequestMapping(value ="/orderDetails", method = RequestMethod.GET)
 	public Result orderDetails(String orderNo) {
 		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单编号"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectOrderDetail(Long.valueOf(orderNo)));
+		return res;
+	}
+	
+	/**
+	 * 订单支付(首付)
+	 * @param orderNo 订单编号
+	 * @param fundAmount 支付金额
+	 * @return 备注
+	 */
+	@RequestMapping(value = "/payForFirst", method = RequestMethod.POST)
+	public Result payForFirst(String orderNo,String fundAmount,String remarks) {
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(fundAmount)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
+			return res;
+		}
+		orderServiceImpl.payForFirst(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		return res;
+	}
+	
+	/**
+	 * 支付尾款
+	 * @param orderNo 订单编号
+	 * @param fundAmount 支付金额
+	 * @param remarks 备注
+	 * @return
+	 */
+	@RequestMapping(value = "/payForLast", method = RequestMethod.POST)
+	public Result payForLast(String orderNo,String fundAmount,String remarks){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(fundAmount)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
+			return res;
+		}
+		orderServiceImpl.payForLast(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		return res;
+	}
+	
+	/**
+	 * 查询支付流水列表
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/fundingHistory", method = RequestMethod.POST)
+	public Result fundingHistory(String orderNo,Integer pageNo,Integer pageSize) {
+		Result res = new Result();
+		if(StringUtils.isNotBlank(orderNo))
+			orderServiceImpl.selectFundingHistory(Long.valueOf(orderNo),pageNo,pageSize);
+		else
+			orderServiceImpl.selectFundingHistory(null,pageNo,pageSize);
 		return res;
 	}
 	
 	/**
-	 * 订单支付(首付 or 尾款)
-	 * @param orderId 
+	 * 订单提现
+	 * @param orderNo
 	 * @return
 	 */
-	public Result orderPay(String orderNo,Integer Channel) {
+	@RequestMapping(value = "/applyForWithdraw", method = RequestMethod.POST)
+	public Result applyForWithdraw(String orderNo,String remarks){
 		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		orderServiceImpl.applyForWithdraw(Long.valueOf(orderNo),remarks);
 		return res;
 	}
 	
 	/**
-	 * 查询支付流水
-	 * @param orderId
+	 * 取消订单
+	 * @param orderNo
 	 * @return
 	 */
-	public Result payHistory(String orderNo) {
+	@RequestMapping(value = "/applyForCancel", method = RequestMethod.GET)
+	public Result applyForCancel(String orderNo){
 		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		orderServiceImpl.applyForCancel(Long.valueOf(orderNo));
 		return res;
 	}
 }

+ 51 - 0
src/main/java/com/goafanti/order/enums/AuditState.java

@@ -0,0 +1,51 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AuditState {
+	/** 等待审核 **/
+	WAIT_AUDIT(0,"WAIT_AUDIT"),
+	/** 审核通过 **/
+	AUDIT_SUCCESS(1,"AUDIT_SUCCESS"),
+	/** 审核通过 **/
+	AUDIT_FAIL(2,"AUDIT_FAIL"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private AuditState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, AuditState> status = new HashMap<Integer, AuditState>();
+
+	static {
+		for (AuditState value : AuditState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static AuditState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 5 - 5
src/main/java/com/goafanti/order/enums/OrderType.java

@@ -3,7 +3,7 @@ package com.goafanti.order.enums;
 import java.util.HashMap;
 import java.util.Map;
 
-public enum OrderType {
+public enum CommodityType {
 	/** 科技服务 **/
 	TECH_SERVICE(0,"TECH_SERVICE"),
 	/** 科技成果购买 **/
@@ -18,19 +18,19 @@ public enum OrderType {
 	MEMBER_UPGRADE(5,"MEMBER_UPGRADE"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
-	private OrderType(Integer typeCode, String typeName) {
+	private CommodityType(Integer typeCode, String typeName) {
 		this.typeCode = typeCode;
 		this.typeName = typeName;
 	}
 
-	private static Map<Integer, OrderType> types = new HashMap<Integer, OrderType>();
+	private static Map<Integer, CommodityType> types = new HashMap<Integer, CommodityType>();
 
 	static {
-		for (OrderType value : OrderType.values()) {
+		for (CommodityType value : CommodityType.values()) {
 			types.put(value.getTypeCode(), value);
 		}
 	}
-	public static OrderType getStatus(Integer typeCode) {
+	public static CommodityType getTypeCode(Integer typeCode) {
 		if (containsType(typeCode)) {
 			return types.get(typeCode);
 		}

+ 13 - 0
src/main/java/com/goafanti/order/enums/OrderAction.java

@@ -0,0 +1,13 @@
+package com.goafanti.order.enums;
+
+
+public enum OrderAction {
+	ADD_INTENTION,
+	INTENTION_CONFIRM,
+	CONFIRM_PAY_FOR_FIRST,
+	CONFIRM_PAY_FOR_LAST,
+	APPLY_FOR_WITHDRAW,
+	CONFIRM_WITHDRAW,
+	APPLY_FOR_CANCEL,
+	REFUND_CONFIRM
+}

+ 4 - 4
src/main/java/com/goafanti/order/enums/OrderChannel.java

@@ -18,21 +18,21 @@ public enum OrderChannel {
 		this.desc = desc;
 	}
 
-	private static Map<Integer, OrderChannel> status = new HashMap<Integer, OrderChannel>();
+	private static Map<Integer, OrderChannel> channels = new HashMap<Integer, OrderChannel>();
 
 	static {
 		for (OrderChannel value : OrderChannel.values()) {
-			status.put(value.getCode(), value);
+			channels.put(value.getCode(), value);
 		}
 	}
 	public static OrderChannel getStatus(Integer code) {
 		if (containsType(code)) {
-			return status.get(code);
+			return channels.get(code);
 		}
 		return INVALID;
 	}
 	public static boolean containsType(Integer code) {
-		return status.containsKey(code);
+		return channels.containsKey(code);
 	}
 	
 	private Integer	code;

+ 4 - 4
src/main/java/com/goafanti/order/enums/PayChannel.java

@@ -18,21 +18,21 @@ public enum PayChannel {
 		this.desc = desc;
 	}
 
-	private static Map<Integer, PayChannel> status = new HashMap<Integer, PayChannel>();
+	private static Map<Integer, PayChannel> channels = new HashMap<Integer, PayChannel>();
 
 	static {
 		for (PayChannel value : PayChannel.values()) {
-			status.put(value.getCode(), value);
+			channels.put(value.getCode(), value);
 		}
 	}
 	public static PayChannel getStatus(Integer code) {
 		if (containsType(code)) {
-			return status.get(code);
+			return channels.get(code);
 		}
 		return INVALID;
 	}
 	public static boolean containsType(Integer code) {
-		return status.containsKey(code);
+		return channels.containsKey(code);
 	}
 	
 	private Integer	code;

+ 8 - 6
src/main/java/com/goafanti/order/enums/PaymentState.java

@@ -4,16 +4,18 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum PaymentState {
-	/** 等付款  **/
-	WAIT_FOR_PAY(0,"WAIT_FOR_PAY"),
+	/** 首付待付清 **/
+	WAIT_PAY_FIRST_BALANCE(0,"WAIT_PAY_FIRST_BALANCE"),
 	/** 已首付 **/
 	ALREADY_FIRST_PAY(1,"ALREADY_FIRST_PAY"),
-	/** 待付清 **/
-	WAIT_PAY_ALL(2,"WAIT_PAY_ALL"),
+	/** 尾款待付清 **/
+	WAIT_PAY_LAST_BALANCE(2,"WAIT_PAY_LAST_BALANCE"),
+	/** 尾款待付清 **/
+	ALREADY_LAST_PAY(3,"ALREADY_LAST_PAY"),
 	/** 待退款 **/
-	WAIT_REFUND(3,"WAIT_REFUND"),
+	WAIT_FOR_REFUND(4,"WAIT_FOR_REFUND"),
 	/** 已退款 **/
-	ALREADY_REFUND(4,"ALREADY_REFUND"),
+	ALREADY_REFUND(5,"ALREADY_REFUND"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	

+ 5 - 5
src/main/java/com/goafanti/order/enums/TransactionState.java

@@ -3,7 +3,7 @@ package com.goafanti.order.enums;
 import java.util.HashMap;
 import java.util.Map;
 
-public enum TransactionState {
+public enum TransactionMode {
 	/** 线上支付 **/
 	ONLINE(0,"ONLINE"),
 	/** 线下支付 **/
@@ -11,19 +11,19 @@ public enum TransactionState {
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	
-	private TransactionState(Integer code, String desc) {
+	private TransactionMode(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
 	}
 
-	private static Map<Integer, TransactionState> status = new HashMap<Integer, TransactionState>();
+	private static Map<Integer, TransactionMode> status = new HashMap<Integer, TransactionMode>();
 
 	static {
-		for (TransactionState value : TransactionState.values()) {
+		for (TransactionMode value : TransactionMode.values()) {
 			status.put(value.getCode(), value);
 		}
 	}
-	public static TransactionState getStatus(Integer code) {
+	public static TransactionMode getStatus(Integer code) {
 		if (containsType(code)) {
 			return status.get(code);
 		}

+ 56 - 0
src/main/java/com/goafanti/order/enums/TransactionSubject.java

@@ -0,0 +1,56 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 资金流水科目
+ * @author Administrator
+ *
+ */
+public enum TransactionSubject {
+	/** 代收 **/
+	SUPPLY_COLLECT(0,"SUPPLY_COLLECT"),
+	/** 代付 **/
+	SUPPLY_PAY(1,"SUPPLY_PAY"),
+	/** 退款 **/
+	REFUND(2,"REFUND"),
+	/** 无效 **/
+	INVALID(10, "INVALID");
+	
+	private TransactionSubject(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, TransactionSubject> subjects = new HashMap<Integer, TransactionSubject>();
+
+	static {
+		for (TransactionSubject value : TransactionSubject.values()) {
+			subjects.put(value.getCode(), value);
+		}
+	}
+	public static TransactionSubject getStatus(Integer code) {
+		if (containsType(code)) {
+			return subjects.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return subjects.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 80 - 0
src/main/java/com/goafanti/order/service/OrderService.java

@@ -1,5 +1,85 @@
 package com.goafanti.order.service;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.FundingListBo;
+import com.goafanti.order.bo.OrderDetailBo;
+
 public interface OrderService {
+	
+	/**
+	 * 查询商品详情
+	 * @param commodityId 商品id
+	 * @param orderType 订单类型
+	 * @return
+	 */
+	OrderDetailBo selectCommodityDetail(String commodityId,Integer orderType);
+
+	/**
+	 * 添加意向
+	 * @param orderNo 订单编号
+	 * @param commodityId 商品id
+	 * @param commodityMode 商品型号
+	 * @param commodityQuantity 商品数量
+	 * @param commodityType 商品类型
+	 * @param createTime 创建时间
+	 * @param remarks 备注
+	 * @return
+	 */
+	int addIntention(Long orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
+			String createTime, String remarks) throws ParseException ;
+
+	/**
+	 * 支付定金
+	 * @param orderNo 订单编号
+	 * @param fundAmount 金额
+	 * @return remarks 备注
+	 */
+	int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks);
+
+	/**
+	 * 支付尾款
+	 * @param orderNo 订单编号
+	 * @param fundAmount 金额
+	 * @param remarks 备注
+	 * @return
+	 */
+	int payForLast(Long orderNo, BigDecimal fundAmount, String remarks);
+
+	/**
+	 * 
+	 * @param confirm 是否
+	 * @return
+	 */
+	Pagination<OrderDetailBo> selectOrderList(boolean confirm,Integer pageNo,Integer PageSize);
+
+	/**
+	 * 查询订单详情
+	 * @param orderNo
+	 * @return
+	 */
+	OrderDetailBo selectOrderDetail(Long orderNo);
+
+	/**
+	 * 查询流水记录
+	 * @param orderNo
+	 * @return
+	 */
+	Pagination<FundingListBo> selectFundingHistory(Long orderNo,Integer pageNo,Integer PageSize);
+
+	/**
+	 * 提现
+	 * @param orderNo
+	 * @return
+	 */
+	int applyForWithdraw(Long orderNo,String remarks);
 
+	/**
+	 * 取消订单
+	 * @param orderNo
+	 * @return
+	 */
+	int applyForCancel(Long orderNo);
 }

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

@@ -1,7 +1,549 @@
 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 org.springframework.transaction.annotation.Transactional;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.dao.TFundingRecordsMapper;
+import com.goafanti.common.dao.TOrderMapper;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.TFundingRecords;
+import com.goafanti.common.model.TOrder;
+import com.goafanti.common.model.User;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.DecimalCalculate;
+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.FundingListBo;
+import com.goafanti.order.bo.OperatorActive;
+import com.goafanti.order.bo.OrderDetailBo;
+import com.goafanti.order.enums.AuditState;
+import com.goafanti.order.enums.IntentionSate;
+import com.goafanti.order.enums.LiquidationSate;
+import com.goafanti.order.enums.OrderAction;
+import com.goafanti.order.enums.OrderChannel;
+import com.goafanti.order.enums.OrderState;
+import com.goafanti.order.enums.PayChannel;
+import com.goafanti.order.enums.PaymentState;
+import com.goafanti.order.enums.TradingState;
+import com.goafanti.order.enums.TransactionMode;
+import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.OrderService;
 
-public class OrderServiceImpl implements OrderService {
+@Service
+public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements OrderService {
+	
+	@Autowired
+	private TOrderMapper tOrderMapper;
+	@Autowired
+	private JDBCIdGenerator	idGenerator;
+	@Autowired
+	private TFundingRecordsMapper tFundingRecordsMapper;
+	
+	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);// 默认首付价格
+	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);// 默认单价
+	private final String DEFAULT_PLATFORM_ID = "0";// 平台默认id
+	private final double  DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
+	private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
+	@Override
+	public OrderDetailBo selectCommodityDetail(String commodityId, Integer orderType) {
+		OrderDetailBo bo = tOrderMapper.selectCommodityDetail(commodityId,orderType);
+		bo.setOrderNo(String.valueOf(idGenerator.generateId()));
+		bo.setCreateTime(DateUtils.formatDate(new Date(),AFTConstants.YYYYMMDDHHMMSS));
+		if(StringUtils.isBlank(bo.getFirstPayment())) bo.setFirstPayment(String.valueOf(DEFAULT_FIRST_PAYMENT.doubleValue()));
+		return bo;
+	}
+
+	@Override
+	public int addIntention(Long orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
+			String createTime,String remarks) throws ParseException {
+		OrderDetailBo bo =  tOrderMapper.selectCommodityDetail(commodityId,commodityType);
+		BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE 
+				: new BigDecimal(DecimalCalculate.mul(Double.valueOf(bo.getCommodityPrice()),DEFAULT_COMMODITY_DISCOUNT));
+		BigDecimal orderAmount = new BigDecimal(DecimalCalculate.mul(commodityPrice.doubleValue(),Double.valueOf(String.valueOf(commodityQuantity))));
+		TOrder tOrder = new TOrder();
+		tOrder.setOrderNo(orderNo);
+		tOrder.setCommodityId(commodityId);
+		tOrder.setCreater(TokenManager.getUserToken().getNickname());
+		tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
+		tOrder.setBuyerId(TokenManager.getUserId());
+		tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+		tOrder.setCommodityMode(commodityMode);
+		tOrder.setCommodityType(commodityType);
+		tOrder.setCommodityQuantity(commodityQuantity);
+		tOrder.setBrokerageProportion(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION));
+		tOrder.setBrokerageAmount(new BigDecimal(DecimalCalculate.mul(commodityPrice.doubleValue(), DEFAULT_BROKERAGE_PROPORTION)));
+		tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
+		tOrder.setCommodityPrice(commodityPrice);
+		tOrder.setOrderAmount(orderAmount);
+		tOrder.setOrderRemarks(remarks);
+		tOrder.setDeleteSign(Boolean.FALSE);
+		tOrder.setOrderChannel(OrderChannel.APP.getCode());
+		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
+		return 0;
+	}
+	
+	/**
+	 * 订单状态流转
+	 * @param orderStatus
+	 * @param intentionStatus
+	 * @param tradingStatus
+	 * @param paymentStatus
+	 * @param liquidationStatus
+	 * @param actionType
+	 */
+	public void setOrderState(OrderAction orderAction,BigDecimal changeAmount,TOrder tOrder,boolean confirm){
+		if(orderAction == OrderAction.ADD_INTENTION){ //添加意向订单
+			if(tOrder.getOrderStatus() != null || tOrder.getIntentionStatus() != null || tOrder.getTradingStatus() != null
+					|| tOrder.getPaymentStatus() != null || tOrder.getLiquidationStatus() != null
+					|| tOrder.getActuallyBrokerageAmount() != null || tOrder.getActuallyFirstPayment() != null) {
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"添加意向订单"));
+			}
+			tOrder.setOrderStatus(OrderState.INTENTION.getCode());
+			tOrder.setIntentionStatus(IntentionSate.WAIT_SELLER_CONFIRM.getCode());
+			tOrder.setTradingStatus(TradingState.WAIT_FOR_TRADE.getCode()); 
+			tOrder.setPaymentStatus(PaymentState.WAIT_PAY_FIRST_BALANCE.getCode());
+			tOrder.setLiquidationStatus(LiquidationSate.WAIT_FOR_PAY.getCode());
+			tOrder.setActuallyFirstPayment(new BigDecimal(0));
+			tOrder.setActuallyTotalPayment(new BigDecimal(0));
+		}else if(orderAction == OrderAction.INTENTION_CONFIRM){ //确认意向订单 (用户确认)
+			if(tOrder.getOrderStatus() != OrderState.INTENTION.getCode() 
+					|| tOrder.getIntentionStatus() != IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+					|| tOrder.getTradingStatus() != TradingState.WAIT_FOR_TRADE.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.WAIT_FOR_PAY.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认意向订单"));
+			}
+			if(confirm){
+				tOrder.setOrderStatus(OrderState.WAIT_FOR_PAY.getCode());
+				tOrder.setIntentionStatus(IntentionSate.SELLER_CONFIRM.getCode());
+				tOrder.setTradingStatus(TradingState.ON_TRADE.getCode());
+			}else{
+				tOrder.setOrderStatus(OrderState.CANCELLED.getCode());
+				tOrder.setIntentionStatus(IntentionSate.SELLER_REFUSE.getCode());
+				tOrder.setTradingStatus(TradingState.TRADE_FAILED.getCode());
+			}
+		}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_FIRST){ // 支付首付(审核员先审核流水)
+			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
+					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
+					|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.WAIT_FOR_PAY.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,""));
+			}
+			int boundary = DecimalCalculate.compareTo(
+					DecimalCalculate.add(tOrder.getActuallyFirstPayment().doubleValue(),changeAmount.doubleValue()),
+					tOrder.getFirstPayment().doubleValue());
+			if(boundary == 1){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付首付"));
+			}else if(boundary == -1){ //首付待付清 ()
+				tOrder.setActuallyTotalPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(), changeAmount.doubleValue())));
+				tOrder.setActuallyFirstPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyFirstPayment().doubleValue(), changeAmount.doubleValue())));
+				tOrder.setPaymentStatus(PaymentState.WAIT_PAY_FIRST_BALANCE.getCode());
+				tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode()); 
+			}else if(boundary == 0){ //首付已结清
+				tOrder.setActuallyTotalPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(), changeAmount.doubleValue())));
+				tOrder.setActuallyFirstPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyFirstPayment().doubleValue(),changeAmount.doubleValue())));
+				tOrder.setPaymentStatus(PaymentState.ALREADY_FIRST_PAY.getCode());
+				tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode());
+			}
+		}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核员先审核流水)
+			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
+					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
+					|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.ALREADY_FIRST_PAY.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.PART_PAY.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付尾款"));
+			}
+			int boundary = DecimalCalculate.compareTo(
+					DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(),changeAmount.doubleValue()),
+					tOrder.getOrderAmount().doubleValue());
+			if(boundary == 1){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付尾款"));
+			}else if(boundary == -1){
+				tOrder.setActuallyTotalPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(), changeAmount.doubleValue())));
+				tOrder.setPaymentStatus(PaymentState.WAIT_PAY_LAST_BALANCE.getCode());
+				tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode());
+			}else if(boundary == 0){
+				tOrder.setOrderStatus(OrderState.COMPLETED.getCode());
+				tOrder.setActuallyTotalPayment(
+						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(), changeAmount.doubleValue())));
+				tOrder.setPaymentStatus(PaymentState.ALREADY_LAST_PAY.getCode());
+				tOrder.setLiquidationStatus(LiquidationSate.FULL_PAY.getCode());
+				tOrder.setTradingStatus(TradingState.TRADE_SUCCESS.getCode());
+			}
+		}else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请 (用户申请)
+			if(tOrder.getOrderStatus() != OrderState.COMPLETED.getCode()
+					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
+					|| tOrder.getTradingStatus() != TradingState.TRADE_SUCCESS.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.ALREADY_LAST_PAY.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.FULL_PAY.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"等待提现"));
+			}
+			tOrder.setLiquidationStatus(LiquidationSate.WAIT_FOR_WITHDRAW.getCode());
+		}else if(orderAction == OrderAction.CONFIRM_WITHDRAW){ //提现确认 (审核员先审核流水)
+			if(tOrder.getOrderStatus() != OrderState.COMPLETED.getCode()
+					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
+					|| tOrder.getTradingStatus() != TradingState.TRADE_SUCCESS.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.ALREADY_LAST_PAY.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.WAIT_FOR_WITHDRAW.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"提现确认"));
+			}
+			tOrder.setLiquidationStatus(LiquidationSate.PAY_SETTLE.getCode());
+		}else if(orderAction == OrderAction.APPLY_FOR_CANCEL){ //取消订单(用户取消)
+			boolean flag = true;
+			if(tOrder.getOrderStatus() == OrderState.CANCELLED.getCode()) flag = false;
+			if(tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()
+					|| tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
+					|| tOrder.getIntentionStatus() == IntentionSate.EXPIRED.getCode()){
+				flag = false;
+			}
+			if(tOrder.getTradingStatus() == TradingState.TRADE_FAILED.getCode()) flag = false;
+			if(tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode() 
+					|| tOrder.getPaymentStatus() == PaymentState.ALREADY_REFUND.getCode()) flag = false;
+			if(tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()
+					|| tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()
+					|| tOrder.getLiquidationStatus() == LiquidationSate.REFUND_SETTLE.getCode()){
+				flag = false;
+			}
+			if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"取消订单"));
+			tOrder.setOrderStatus(OrderState.CANCELLED.getCode());
+			tOrder.setIntentionStatus(IntentionSate.BUYER_CANCELLED.getCode());
+			if(tOrder.getTradingStatus() != TradingState.TRADE_SUCCESS.getCode()) tOrder.setTradingStatus(TradingState.TRADE_FAILED.getCode());
+			if(tOrder.getActuallyTotalPayment().doubleValue() > 0){ //需要退款
+				tOrder.setPaymentStatus(PaymentState.WAIT_FOR_REFUND.getCode());
+				tOrder.setLiquidationStatus(LiquidationSate.WAIT_FOR_REFUND.getCode());
+			}
+		}else if(orderAction == OrderAction.REFUND_CONFIRM){ //退款确认(审核员)
+			if(tOrder.getOrderStatus() != OrderState.CANCELLED.getCode()
+					|| tOrder.getIntentionStatus() != IntentionSate.BUYER_CANCELLED.getCode()
+					|| tOrder.getPaymentStatus() != PaymentState.WAIT_FOR_REFUND.getCode()
+					|| tOrder.getLiquidationStatus() != LiquidationSate.WAIT_FOR_REFUND.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认退款"));
+			}
+			tOrder.setPaymentStatus(PaymentState.ALREADY_REFUND.getCode());
+			tOrder.setLiquidationStatus(LiquidationSate.REFUND_SETTLE.getCode());
+		}
+	}
 	
+	/**
+	 * 添加流水记录
+	 * @param orderNo 订单编号
+	 * @param creater 创建人
+	 * @param payeeId 收款人
+	 * @param payerId 付款人
+	 * @param remarks 附言
+	 * @param transactionSubject 交易科目
+	 * @param payChannel 支付渠道
+	 * @param transactionMode 支付方式
+	 * @param FundAudit 流水审核
+	 * @return
+	 */
+	public int addFundRecord(Long orderNo,String creater,String payeeId,String payerId,String remarks,TransactionSubject transactionSubject,PayChannel payChannel,
+			BigDecimal transactionAmount,TransactionMode transactionMode,AuditState auditState){
+		TFundingRecords records = new TFundingRecords();
+		records.setId(UUID.randomUUID().toString());
+		records.setConfirmSign(auditState.getCode());
+		records.setCreater(creater);
+		records.setDeleteSign(Boolean.FALSE);
+		records.setOrderNo(orderNo);
+		records.setTransactionAmount(transactionAmount);
+		records.setPayeeId(payeeId);
+		records.setPayerId(payerId);
+		records.setRemarks(remarks);
+		records.setTransactionAmount(transactionAmount);
+		records.setTransactionMode(transactionMode.getCode());
+		records.setTransactionSubject(transactionSubject.getCode());
+		tFundingRecordsMapper.insert(records);
+		return 1;
+	}
+	
+	/**
+	 * 设置按钮状态
+	 * @param tOrder
+	 * @return
+	 */
+	private OperatorActive setOperatorActive(TOrder tOrder){
+		OperatorActive active = new OperatorActive();
+		if (TokenManager.getToken() instanceof User) {
+			active.setConfirmPayForFirst(false);
+			active.setConfirmPayForLast(false);
+			active.setConfirmRefund(false);
+			active.setConfirmWithdraw(false);
+			if (TokenManager.getUserId().equals(tOrder.getBuyerId())) { // 买方
+				active.setConfirmIntention(false);
+				active.setApplyForWithdraw(false);
+				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()) {
+					active.setPayForFirst(true);
+				} else {
+					active.setPayForFirst(false);
+				}
+				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.PART_PAY.getCode()) {
+					active.setPayForLast(true);
+				} else {
+					active.setPayForLast(true);
+				}
+				boolean flag = true;
+				if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
+					flag = false;
+				if (tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()
+						|| tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
+						|| tOrder.getIntentionStatus() == IntentionSate.EXPIRED.getCode()) {
+					flag = false;
+				}
+				if (tOrder.getTradingStatus() == TradingState.TRADE_FAILED.getCode())
+					flag = false;
+				if (tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
+						|| tOrder.getPaymentStatus() == PaymentState.ALREADY_REFUND.getCode())
+					flag = false;
+				if (tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()
+						|| tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()
+						|| tOrder.getLiquidationStatus() == LiquidationSate.REFUND_SETTLE.getCode()) {
+					flag = false;
+				}
+				active.setApplyForCancel(flag);
+			} else if (TokenManager.getUserId().equals(tOrder.getSellerId())) { //卖方
+				active.setPayForFirst(false);
+				active.setPayForLast(false);
+				active.setApplyForCancel(false);
+				if (tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()) {
+					active.setConfirmIntention(true);
+				} else {
+					active.setConfirmIntention(false);
+				}
+				if (tOrder.getOrderStatus() == OrderState.COMPLETED.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.TRADE_SUCCESS.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.ALREADY_LAST_PAY.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.FULL_PAY.getCode()) {
+					active.setApplyForWithdraw(true);
+				} else {
+					active.setApplyForWithdraw(false);
+				}
+			} else {
+				active.setPayForFirst(false);
+				active.setPayForLast(false);
+				active.setApplyForCancel(false);
+				active.setConfirmIntention(false);
+				active.setApplyForWithdraw(false);
+			}
+		}
+		if (TokenManager.getToken() instanceof Admin) {
+			active.setApplyForCancel(false);
+			active.setPayForFirst(false);
+			active.setPayForLast(false);
+			if (tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID)) { // 平台作为卖方
+				if (tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()) {
+					active.setConfirmIntention(true);
+				} else {
+					active.setConfirmIntention(false);
+				}
+				if (tOrder.getOrderStatus() == OrderState.COMPLETED.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.TRADE_SUCCESS.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.ALREADY_LAST_PAY.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.FULL_PAY.getCode()) {
+					active.setApplyForWithdraw(true);
+				} else {
+					active.setApplyForWithdraw(false);
+				}
+				
+			}else{
+				active.setConfirmIntention(false);
+				active.setApplyForWithdraw(false);
+			}
+			//平台作为中间方  确认首付 -尾款-提现-退款
+			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+					&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+					&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
+					&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+					&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()){
+				active.setConfirmPayForFirst(true);
+			}else{
+				active.setConfirmPayForFirst(false);
+			}
+			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+					&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+					&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
+					&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()
+					&& tOrder.getLiquidationStatus() == LiquidationSate.PART_PAY.getCode()){
+				active.setConfirmPayForLast(true);
+			}else{
+				active.setConfirmPayForLast(false);
+			}
+			if(tOrder.getOrderStatus() == OrderState.COMPLETED.getCode()
+					&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
+					&& tOrder.getTradingStatus() == TradingState.TRADE_SUCCESS.getCode()
+					&& tOrder.getPaymentStatus() == PaymentState.ALREADY_LAST_PAY.getCode()
+					&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()){
+				active.setConfirmWithdraw(true);
+			}else{
+				active.setConfirmWithdraw(false);
+			}
+			if(tOrder.getOrderStatus() == OrderState.CANCELLED.getCode()
+					&& tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
+					&& tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
+					&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()){
+				active.setConfirmRefund(true);
+			}else{
+				active.setConfirmRefund(false);
+			}
+		}
+		return active;
+	}
+
+	@Override
+	public int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
+				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
+		tOrderMapper.insert(tOrder);
+		return 1;
+	}
+
+	@Override
+	public int payForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
+				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
+		tOrderMapper.insert(tOrder);
+		return 1;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrderDetailBo> selectOrderList(boolean confirm,Integer pageNo,Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		Pagination<OrderDetailBo> result = new Pagination<OrderDetailBo>();
+		if(confirm) params.put("intentionStatus", IntentionSate.WAIT_SELLER_CONFIRM.getCode()); //购买意向
+		params.put("uid", TokenManager.getUserId());
+		Pagination<TOrder> data = (Pagination<TOrder>)findPage("selectOrderListByPage", "selectOrderListCount", params, pageNo, pageSize);
+		List<TOrder> list = (List<TOrder>)data.getList();
+		OrderDetailBo bo = null;
+		List<OrderDetailBo> boList = new ArrayList<OrderDetailBo>(); 
+		if(list.size()>0){
+			for(TOrder t:list){
+				bo = tOrderMapper.selectCommodityDetail(t.getCommodityId(),t.getCommodityType());
+				bo.setOrderNo(String.valueOf(t.getOrderNo()));
+				bo.setCommodityQuantity(t.getCommodityQuantity());
+				bo.setCommodityMode(t.getCommodityMode());
+				bo.setCommodityId(t.getCommodityId());
+				bo.setOrderRemarks(t.getOrderRemarks());
+				bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
+				bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
+				bo.setCommodityType(t.getCommodityType());
+				bo.setOrderAmount(String.valueOf(t.getOrderAmount()));
+				bo.setOperatorActive(setOperatorActive(t));
+				boList.add(bo);
+			}
+		}
+		result.setList(boList);
+		result.setPageNo(data.getPageNo());
+		result.setPageSize(data.getPageSize());
+		result.setTotalCount(data.getTotalCount());
+		result.setFilterNo(data.getFilterNo());
+		return result;
+	}
+
+	@Override
+	public OrderDetailBo selectOrderDetail(Long orderNo) {
+		TOrder t = tOrderMapper.selectByPrimaryKey(orderNo);
+		OrderDetailBo bo = new OrderDetailBo();
+		bo.setOrderNo(String.valueOf(t.getOrderNo()));
+		bo.setCommodityQuantity(t.getCommodityQuantity());
+		bo.setCommodityMode(t.getCommodityMode());
+		bo.setCommodityId(t.getCommodityId());
+		bo.setOrderRemarks(t.getOrderRemarks());
+		bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
+		bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
+		bo.setCommodityType(t.getCommodityType());
+		bo.setOrderAmount(String.valueOf(t.getOrderAmount()));
+		bo.setOperatorActive(setOperatorActive(t));
+		return bo;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<FundingListBo> selectFundingHistory(Long orderNo,Integer pageNo,Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(orderNo != null) params.put("orderNo", orderNo);
+		params.put("uid", TokenManager.getUserId());
+		Pagination<FundingListBo> data = (Pagination<FundingListBo>)findPage("selectFundingHistoryByPage","selectFundingHistoryCount", params, pageNo, pageSize);
+		List<FundingListBo> list = (List<FundingListBo>)data.getList();
+		OrderDetailBo odBo = null;
+		if(list.size()>0){
+			for(FundingListBo bo:list){
+				odBo = tOrderMapper.selectCommodityDetail(bo.getCommodityId(),bo.getCommodityType());
+				bo.setCommodityName(odBo.getCommodityName());
+			}
+		}
+		return data;
+	}
+
+	@Override
+	@Transactional
+	public int applyForWithdraw(Long orderNo,String remarks) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		BigDecimal transactionAmount = new BigDecimal(DecimalCalculate.sub(tOrder.getActuallyTotalPayment().doubleValue(), 
+				tOrder.getActuallyBrokerageAmount().doubleValue())); 
+		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), TokenManager.getUserId(), DEFAULT_PLATFORM_ID, remarks,
+				TransactionSubject.SUPPLY_COLLECT, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
+		setOrderState(OrderAction.APPLY_FOR_WITHDRAW, new BigDecimal(0), tOrder, false);
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
+		return 1;
+	}
+
+	@Override
+	@Transactional
+	public int applyForCancel(Long orderNo) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		setOrderState(OrderAction.APPLY_FOR_CANCEL, new BigDecimal(0), tOrder, false);
+		if(tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode() 
+				&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()){ //退款
+			BigDecimal transactionAmount = new BigDecimal(DecimalCalculate.sub(tOrder.getActuallyTotalPayment().doubleValue(), 
+					tOrder.getActuallyBrokerageAmount().doubleValue())); 
+			addFundRecord(orderNo, "平台方", DEFAULT_PLATFORM_ID,TokenManager.getUserId(), "买家取消订单",
+					TransactionSubject.REFUND, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
+		}
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
+		return 1;
+	}
+
 }

+ 3 - 1
src/main/resources/props/error.properties

@@ -103,4 +103,6 @@ BUSINESS_ALREADY_EXIST = \u9879\u76EE\u5DF2\u5B58\u5728
 
 AT_LEAST_A_BUSINESS = \u81F3\u5C11\u9700\u8981\u586B\u5199\u4E00\u9879\u4E1A\u52A1
 
-USER_NICKNAME_EXIST = \u6635\u79F0\u5DF2\u5B58\u5728
+USER_NICKNAME_EXIST = \u6635\u79F0\u5DF2\u5B58\u5728
+
+NOT_ACCORD_WITH_NEXT = \u4E0D\u7B26\u5408\u6D41\u8F6C\u6761\u4EF6