Browse Source

合并冲突

anderx 8 years ago
parent
commit
4db074e474

+ 1 - 1
GeneratorConfig.xml

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

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -204,7 +204,7 @@ public class AppApiController extends BaseApiController {
 		User user = userServiceImpl.selectByNumber(easemobName);
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("nickName", user.getNickname());
-		jsonObject.put("headPortraitUrl", user.getHeadPortraitUrl());
+		jsonObject.put("headPortraitUrl", null == user.getHeadPortraitUrl()?"":user.getHeadPortraitUrl());
 		res.setData(jsonObject);
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -162,7 +162,7 @@ public class PublicController extends BaseController {
 			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE, mobileVerifyCode);// 存入Shiro会话session
 			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
 		}
-		String paramString = "{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"阿凡提信息科技\"}";
+		String paramString = "{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"技淘网\"}";
 		String ret = MobileMessageUtils.sendMessage(mobileCodeTemplate, paramString, mobile, accessKey, accessSecret);
 		if (StringUtils.isNotBlank(ret)) {
 			res.getError().add(buildError(ErrorConstants.M_CODE_ERROR));

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

@@ -11,67 +11,67 @@ public interface TOrderMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	long countByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int deleteByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int deleteByPrimaryKey(Long orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int insert(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int insertSelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	TOrder selectByPrimaryKey(Long orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int updateByPrimaryKeySelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	int updateByPrimaryKey(TOrder record);
 

+ 38 - 23
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 Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     <id column="order_no" jdbcType="BIGINT" property="orderNo" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
@@ -35,12 +35,13 @@
     <result column="order_channel" jdbcType="INTEGER" property="orderChannel" />
     <result column="order_remarks" jdbcType="VARCHAR" property="orderRemarks" />
     <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
+    <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
   </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 Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -74,7 +75,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -108,19 +109,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     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
+    liquidation_status, order_follower, order_channel, order_remarks, delete_sign, commodity_name
   </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 Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     select
     <if test="distinct">
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -150,7 +151,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=BIGINT}
@@ -159,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -170,7 +171,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     insert into t_order (order_no, creater, create_time, 
       update_time, buyer_id, seller_id, 
@@ -181,8 +182,8 @@
       actually_brokerage_amount, order_status, intention_status, 
       trading_status, technology_transfer_progress, 
       payment_status, liquidation_status, order_follower, 
-      order_channel, order_remarks, delete_sign
-      )
+      order_channel, order_remarks, delete_sign, 
+      commodity_name)
     values (#{orderNo,jdbcType=BIGINT}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, #{sellerId,jdbcType=VARCHAR}, 
       #{commodityId,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -192,14 +193,14 @@
       #{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}
-      )
+      #{orderChannel,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=BIT}, 
+      #{commodityName,jdbcType=VARCHAR})
   </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 Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -287,6 +288,9 @@
       <if test="deleteSign != null">
         delete_sign,
       </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -373,13 +377,16 @@
       <if test="deleteSign != null">
         #{deleteSign,jdbcType=BIT},
       </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </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 Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -390,7 +397,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     update t_order
     <set>
@@ -478,6 +485,9 @@
       <if test="record.deleteSign != null">
         delete_sign = #{record.deleteSign,jdbcType=BIT},
       </if>
+      <if test="record.commodityName != null">
+        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -487,7 +497,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=BIGINT},
@@ -517,7 +527,8 @@
       order_follower = #{record.orderFollower,jdbcType=VARCHAR},
       order_channel = #{record.orderChannel,jdbcType=INTEGER},
       order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
-      delete_sign = #{record.deleteSign,jdbcType=BIT}
+      delete_sign = #{record.deleteSign,jdbcType=BIT},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -526,7 +537,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     update t_order
     <set>
@@ -611,6 +622,9 @@
       <if test="deleteSign != null">
         delete_sign = #{deleteSign,jdbcType=BIT},
       </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=BIGINT}
   </update>
@@ -618,7 +632,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 26 20:46:24 CST 2017.
+      This element was generated on Sat Dec 30 15:36:11 CST 2017.
     -->
     update t_order
     set creater = #{creater,jdbcType=VARCHAR},
@@ -647,7 +661,8 @@
       order_follower = #{orderFollower,jdbcType=VARCHAR},
       order_channel = #{orderChannel,jdbcType=INTEGER},
       order_remarks = #{orderRemarks,jdbcType=VARCHAR},
-      delete_sign = #{deleteSign,jdbcType=BIT}
+      delete_sign = #{deleteSign,jdbcType=BIT},
+      commodity_name = #{commodityName,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=BIGINT}
   </update>
   
@@ -657,7 +672,7 @@
   			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}
+  			select id as commodityId,name as commodityName,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}

+ 107 - 84
src/main/java/com/goafanti/common/model/TOrder.java

@@ -7,149 +7,154 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private Long orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private BigDecimal firstPayment;
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private BigDecimal orderAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_amount
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private BigDecimal actuallyBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_status
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private Integer liquidationStatus;
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private String orderFollower;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_channel
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	private Boolean deleteSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.commodity_name
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
+	 */
+	private String commodityName;
 
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Long getOrderNo() {
 		return orderNo;
@@ -158,7 +163,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderNo(Long orderNo) {
 		this.orderNo = orderNo;
@@ -167,7 +172,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getCreater() {
 		return creater;
@@ -176,7 +181,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -185,7 +190,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -194,7 +199,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -203,7 +208,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -212,7 +217,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -221,7 +226,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -230,7 +235,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -239,7 +244,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -248,7 +253,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -257,7 +262,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -266,7 +271,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -275,7 +280,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -284,7 +289,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -293,7 +298,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -302,7 +307,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -311,7 +316,7 @@ public class TOrder {
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getCommodityType() {
 		return commodityType;
@@ -320,7 +325,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
@@ -329,7 +334,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -338,7 +343,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -347,7 +352,7 @@ public class TOrder {
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -356,7 +361,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
@@ -365,7 +370,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getOrderAmount() {
 		return orderAmount;
@@ -374,7 +379,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderAmount(BigDecimal orderAmount) {
 		this.orderAmount = orderAmount;
@@ -383,7 +388,7 @@ public class TOrder {
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -392,7 +397,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -401,7 +406,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getBrokerageProportion() {
 		return brokerageProportion;
@@ -410,7 +415,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setBrokerageProportion(BigDecimal brokerageProportion) {
 		this.brokerageProportion = brokerageProportion;
@@ -419,7 +424,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -428,7 +433,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -437,7 +442,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getActuallyTotalPayment() {
 		return actuallyTotalPayment;
@@ -446,7 +451,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setActuallyTotalPayment(BigDecimal actuallyTotalPayment) {
 		this.actuallyTotalPayment = actuallyTotalPayment;
@@ -455,7 +460,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -464,7 +469,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
@@ -473,7 +478,7 @@ public class TOrder {
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -482,7 +487,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -491,7 +496,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getIntentionStatus() {
 		return intentionStatus;
@@ -500,7 +505,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setIntentionStatus(Integer intentionStatus) {
 		this.intentionStatus = intentionStatus;
@@ -509,7 +514,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getTradingStatus() {
 		return tradingStatus;
@@ -518,7 +523,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setTradingStatus(Integer tradingStatus) {
 		this.tradingStatus = tradingStatus;
@@ -527,7 +532,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getTechnologyTransferProgress() {
 		return technologyTransferProgress;
@@ -536,7 +541,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setTechnologyTransferProgress(Integer technologyTransferProgress) {
 		this.technologyTransferProgress = technologyTransferProgress;
@@ -545,7 +550,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getPaymentStatus() {
 		return paymentStatus;
@@ -554,7 +559,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setPaymentStatus(Integer paymentStatus) {
 		this.paymentStatus = paymentStatus;
@@ -563,7 +568,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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -572,7 +577,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -581,7 +586,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getOrderFollower() {
 		return orderFollower;
@@ -590,7 +595,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderFollower(String orderFollower) {
 		this.orderFollower = orderFollower;
@@ -599,7 +604,7 @@ public class TOrder {
 	/**
 	 * 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -608,7 +613,7 @@ 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
@@ -617,7 +622,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -626,7 +631,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -635,7 +640,7 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public Boolean getDeleteSign() {
 		return deleteSign;
@@ -644,9 +649,27 @@ public class TOrder {
 	/**
 	 * 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
+	 * @mbg.generated  Sat Dec 30 15:36:11 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.commodity_name
+	 * @return  the value of t_order.commodity_name
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
+	 */
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.commodity_name
+	 * @param commodityName  the value for t_order.commodity_name
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
+	 */
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
 }

+ 86 - 16
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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 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  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1913,11 +1913,81 @@ public class TOrderExample {
 			addCriterion("delete_sign not between", value1, value2, "deleteSign");
 			return (Criteria) this;
 		}
+
+		public Criteria andCommodityNameIsNull() {
+			addCriterion("commodity_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameIsNotNull() {
+			addCriterion("commodity_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameEqualTo(String value) {
+			addCriterion("commodity_name =", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotEqualTo(String value) {
+			addCriterion("commodity_name <>", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameGreaterThan(String value) {
+			addCriterion("commodity_name >", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameGreaterThanOrEqualTo(String value) {
+			addCriterion("commodity_name >=", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLessThan(String value) {
+			addCriterion("commodity_name <", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLessThanOrEqualTo(String value) {
+			addCriterion("commodity_name <=", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameLike(String value) {
+			addCriterion("commodity_name like", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotLike(String value) {
+			addCriterion("commodity_name not like", value, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameIn(List<String> values) {
+			addCriterion("commodity_name in", values, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotIn(List<String> values) {
+			addCriterion("commodity_name not in", values, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameBetween(String value1, String value2) {
+			addCriterion("commodity_name between", value1, value2, "commodityName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCommodityNameNotBetween(String value1, String value2) {
+			addCriterion("commodity_name not between", value1, value2, "commodityName");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Tue Dec 26 20:46:24 CST 2017
+	 * @mbg.generated  Sat Dec 30 15:36:11 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -112,7 +112,7 @@ public class FileUtils {
 			uniq = true;
 		}
 		String fileName = "";
-		if (isPrivate || sign != "") {
+		if (isPrivate || StringUtils.isNotBlank(sign)) {
 			if (uniq) {
 				fileName = path + uid + "/" + System.nanoTime() + "_" + sign + suffix;
 			} else {

+ 1 - 1
src/main/java/com/goafanti/common/utils/MobileMessageUtils.java

@@ -13,7 +13,7 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class MobileMessageUtils {
 	
-	private final static String SIGN_NAME = "阿凡提信息科技";
+	private final static String SIGN_NAME = "技淘网";
 	
 	private final static String SERVER_EXCEPTION = "服务器端手机验证码异常:%s";
 	

+ 4 - 0
src/main/java/com/goafanti/message/device/AliasDeviceListResult.java

@@ -9,6 +9,10 @@ import cn.jiguang.common.resp.BaseResult;
 
 public class AliasDeviceListResult extends BaseResult {
    
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3269741817083452181L;
 	@Expose public List<String> registration_ids = new ArrayList<String>();
 
 }

+ 5 - 1
src/main/java/com/goafanti/message/push/CIDResult.java

@@ -8,5 +8,9 @@ import java.util.List;
 
 public class CIDResult extends BaseResult {
 
-    @Expose public List<String> cidlist = new ArrayList<String>();
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -72292842092071340L;
+	@Expose public List<String> cidlist = new ArrayList<String>();
 }

+ 1 - 1
src/main/java/com/goafanti/message/push/model/notification/InterfaceAdapter.java

@@ -7,7 +7,7 @@ import java.lang.reflect.Type;
 /**
  * Created by Ken on 2016/10/25.
  */
-public class InterfaceAdapter<T> implements JsonSerializer, JsonDeserializer<T> {
+public class InterfaceAdapter<T> implements JsonSerializer<T>, JsonDeserializer<T> {
     @Override
     public T deserialize(JsonElement jsonElement, Type type,
                               JsonDeserializationContext jsonDeserializationContext)

+ 4 - 0
src/main/java/com/goafanti/message/report/MessageStatus.java

@@ -5,6 +5,10 @@ import java.io.Serializable;
 public class MessageStatus implements Serializable {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 151062413896845714L;
+	/**
      * 0  送达
      * 1  未送达
      * 2  用户不属于该 app