Просмотр исходного кода

Merge remote-tracking branch 'origin/test'

anderx лет назад: 8
Родитель
Сommit
99c43329e4

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -48,7 +48,8 @@ public class AppApiController extends BaseApiController {
 		Result res = new Result();
 		String headPortraitUrl = handleFile(res, "/avatar/", false, req, "");
 		if(TokenManager.getToken() instanceof User){
-			User u = (User)TokenManager.getToken();
+			User u = new User();
+			u.setId(TokenManager.getUserId());
 			u.setHeadPortraitUrl(headPortraitUrl);
 			userServiceImpl.updateByPrimaryKeySelective(u);
 		}

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

@@ -15,67 +15,67 @@ import org.apache.ibatis.annotations.Param;
 public interface UserIdentityMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	long countByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int deleteByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int insert(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int insertSelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	List<UserIdentity> selectByExample(UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	UserIdentity selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int updateByExample(@Param("record") UserIdentity record, @Param("example") UserIdentityExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int updateByPrimaryKeySelective(UserIdentity record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	int updateByPrimaryKey(UserIdentity record);
 

+ 10 - 4
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -663,7 +663,7 @@
   			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}
+  			select a.id as commodityId,a.nickname as commodityName,a.id as sellerId,ifnull(b.professional_title,'暂无职称') as introduction from user a left join user_identity b on a.id=b.uid where a.id = #{commodityId,jdbcType=VARCHAR}
   		</when>
   		<when test="commodityType == 4">
   			
@@ -683,9 +683,12 @@
     		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}
+    		and intention_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</otherwise>
     </choose>
+    <if test="page_sql!=null">
+			${page_sql}
+	</if>
   </select>
   
    <select id="selectOrderListCount" resultType="java.lang.Integer">
@@ -712,10 +715,13 @@
 	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
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>
+		<if test="page_sql!=null">
+			${page_sql}
+		</if>
   </select>
   
   <select id="selectFundingHistoryCount" resultType="java.lang.Integer">
@@ -724,7 +730,7 @@
 	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
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>

+ 40 - 25
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -46,12 +46,13 @@
     <result column="qualification" jdbcType="VARCHAR" property="qualification" />
     <result column="investment" jdbcType="INTEGER" property="investment" />
     <result column="graduate_school" jdbcType="VARCHAR" property="graduateSchool" />
+    <result column="consultant" jdbcType="INTEGER" property="consultant" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -85,7 +86,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -119,20 +120,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     id, uid, username, sex, date_of_birth_year, date_of_birth_month, id_number, positive_id_url, 
     opposite_id_url, province, city, area, contact_mobile, bank_name, bank_account, bank_card_number, 
     amount_money, audit_status, process, wrong_count, payment_date, expert, celebrity, 
     international, fixed_tel, qq, postal_address, postcode, review_instructions, industry, 
     contacts, email, professional_title, work_unit, education, major_category, qualification, 
-    investment, graduate_school
+    investment, graduate_school, consultant
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     select
     <if test="distinct">
@@ -151,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -162,7 +163,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -171,7 +172,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -182,7 +183,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
@@ -196,8 +197,8 @@
       postcode, review_instructions, industry, 
       contacts, email, professional_title, 
       work_unit, education, major_category, 
-      qualification, investment, graduate_school
-      )
+      qualification, investment, graduate_school, 
+      consultant)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
@@ -210,14 +211,14 @@
       #{postcode,jdbcType=VARCHAR}, #{reviewInstructions,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, 
       #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, 
       #{workUnit,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, #{majorCategory,jdbcType=VARCHAR}, 
-      #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{graduateSchool,jdbcType=VARCHAR}
-      )
+      #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{graduateSchool,jdbcType=VARCHAR}, 
+      #{consultant,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -338,6 +339,9 @@
       <if test="graduateSchool != null">
         graduate_school,
       </if>
+      <if test="consultant != null">
+        consultant,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -457,13 +461,16 @@
       <if test="graduateSchool != null">
         #{graduateSchool,jdbcType=VARCHAR},
       </if>
+      <if test="consultant != null">
+        #{consultant,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -474,7 +481,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     update user_identity
     <set>
@@ -595,6 +602,9 @@
       <if test="record.graduateSchool != null">
         graduate_school = #{record.graduateSchool,jdbcType=VARCHAR},
       </if>
+      <if test="record.consultant != null">
+        consultant = #{record.consultant,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -604,7 +614,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -645,7 +655,8 @@
       major_category = #{record.majorCategory,jdbcType=VARCHAR},
       qualification = #{record.qualification,jdbcType=VARCHAR},
       investment = #{record.investment,jdbcType=INTEGER},
-      graduate_school = #{record.graduateSchool,jdbcType=VARCHAR}
+      graduate_school = #{record.graduateSchool,jdbcType=VARCHAR},
+      consultant = #{record.consultant,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -654,7 +665,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     update user_identity
     <set>
@@ -772,6 +783,9 @@
       <if test="graduateSchool != null">
         graduate_school = #{graduateSchool,jdbcType=VARCHAR},
       </if>
+      <if test="consultant != null">
+        consultant = #{consultant,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -779,7 +793,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 06 15:49:08 CST 2017.
+      This element was generated on Wed Dec 27 16:44:24 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -819,7 +833,8 @@
       major_category = #{majorCategory,jdbcType=VARCHAR},
       qualification = #{qualification,jdbcType=VARCHAR},
       investment = #{investment,jdbcType=INTEGER},
-      graduate_school = #{graduateSchool,jdbcType=VARCHAR}
+      graduate_school = #{graduateSchool,jdbcType=VARCHAR},
+      consultant = #{consultant,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -1020,17 +1035,17 @@
 		limit 0,6	
 	</select> 
 	 <select id="selectUserIdentityByUid" resultType="com.goafanti.user.bo.UserIdentityBo">
-	 	select 	t.id ,t.uid,t.username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,
+	 	select 	t.id ,t.uid,u.nickname as username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,
 			t.industry,t.city,u.introduction,u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
 	from user_identity t left JOIN user u on t.uid = u.id
-	 left join jpush_easemob_account j on t.uid=j.uid
+	left join jpush_easemob_account j on t.uid=j.uid
 	left join (select count(0) as x,seller_id from t_order
 				where order_status != 4
 				group by  seller_id ) o on t.uid=o.seller_id
 	where t.uid=#{uid,jdbcType=VARCHAR}
 	 </select>
 	 
-	 <select id="findUserIdentityListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserIdentityBo">
+ <select id="findUserIdentityListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserIdentityBo">
   	select 	t.id ,t.uid,u.nickname as username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,t.industry,t.city,
 			u.introduction,u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount
 	from user_identity t left JOIN user u on t.uid = u.id

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

@@ -19,6 +19,7 @@
 			b.expert,
 			b.celebrity,
 			b.audit_status as auditStatus,
+			b.consultant,
 			dg1.name as province,
 			dg2.name as city, 
 			dg3.name as area,
@@ -444,7 +445,8 @@
 			b.qualification,
 			b.investment,
 			b.audit_status as auditStatus,
-			b.graduate_school as graduateSchool
+			b.graduate_school as graduateSchool,
+			b.consultant
 		from
 			(
 				select

+ 140 - 117
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,204 +7,209 @@ public class UserIdentity {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.uid
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.username
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String username;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.sex
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_year
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String dateOfBirthYear;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.date_of_birth_month
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String dateOfBirthMonth;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String idNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.positive_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String positiveIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.opposite_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String oppositeIdUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.province
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.city
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.area
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer area;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contact_mobile
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String contactMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_name
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String bankName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_account
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String bankAccount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.bank_card_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String bankCardNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.amount_money
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private BigDecimal amountMoney;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.audit_status
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer auditStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.process
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer process;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.wrong_count
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer wrongCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.payment_date
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Date paymentDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.expert
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer expert;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.celebrity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer celebrity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.international
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer international;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.fixed_tel
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qq
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postal_address
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String postalAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.postcode
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String postcode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.review_instructions
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String reviewInstructions;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.industry
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer industry;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.contacts
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.email
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.professional_title
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String professionalTitle;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.work_unit
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String workUnit;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.education
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String education;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.major_category
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String majorCategory;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.qualification
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String qualification;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.investment
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private Integer investment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.graduate_school
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	private String graduateSchool;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.consultant
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
+	 */
+	private Integer consultant;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id
 	 * @return  the value of user_identity.id
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -213,7 +218,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id
 	 * @param id  the value for user_identity.id
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -222,7 +227,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.uid
 	 * @return  the value of user_identity.uid
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -231,7 +236,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.uid
 	 * @param uid  the value for user_identity.uid
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -240,7 +245,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.username
 	 * @return  the value of user_identity.username
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getUsername() {
 		return username;
@@ -249,7 +254,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.username
 	 * @param username  the value for user_identity.username
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setUsername(String username) {
 		this.username = username;
@@ -258,7 +263,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.sex
 	 * @return  the value of user_identity.sex
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -267,7 +272,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.sex
 	 * @param sex  the value for user_identity.sex
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -276,7 +281,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_year
 	 * @return  the value of user_identity.date_of_birth_year
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
@@ -285,7 +290,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_year
 	 * @param dateOfBirthYear  the value for user_identity.date_of_birth_year
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
@@ -294,7 +299,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.date_of_birth_month
 	 * @return  the value of user_identity.date_of_birth_month
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
@@ -303,7 +308,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.date_of_birth_month
 	 * @param dateOfBirthMonth  the value for user_identity.date_of_birth_month
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
@@ -312,7 +317,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.id_number
 	 * @return  the value of user_identity.id_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getIdNumber() {
 		return idNumber;
@@ -321,7 +326,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.id_number
 	 * @param idNumber  the value for user_identity.id_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
@@ -330,7 +335,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.positive_id_url
 	 * @return  the value of user_identity.positive_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
@@ -339,7 +344,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.positive_id_url
 	 * @param positiveIdUrl  the value for user_identity.positive_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
@@ -348,7 +353,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.opposite_id_url
 	 * @return  the value of user_identity.opposite_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
@@ -357,7 +362,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.opposite_id_url
 	 * @param oppositeIdUrl  the value for user_identity.opposite_id_url
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
@@ -366,7 +371,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.province
 	 * @return  the value of user_identity.province
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getProvince() {
 		return province;
@@ -375,7 +380,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.province
 	 * @param province  the value for user_identity.province
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -384,7 +389,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.city
 	 * @return  the value of user_identity.city
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getCity() {
 		return city;
@@ -393,7 +398,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.city
 	 * @param city  the value for user_identity.city
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -402,7 +407,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.area
 	 * @return  the value of user_identity.area
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getArea() {
 		return area;
@@ -411,7 +416,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.area
 	 * @param area  the value for user_identity.area
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -420,7 +425,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contact_mobile
 	 * @return  the value of user_identity.contact_mobile
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -429,7 +434,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contact_mobile
 	 * @param contactMobile  the value for user_identity.contact_mobile
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -438,7 +443,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_name
 	 * @return  the value of user_identity.bank_name
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getBankName() {
 		return bankName;
@@ -447,7 +452,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_name
 	 * @param bankName  the value for user_identity.bank_name
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
@@ -456,7 +461,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_account
 	 * @return  the value of user_identity.bank_account
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getBankAccount() {
 		return bankAccount;
@@ -465,7 +470,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_account
 	 * @param bankAccount  the value for user_identity.bank_account
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
@@ -474,7 +479,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.bank_card_number
 	 * @return  the value of user_identity.bank_card_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getBankCardNumber() {
 		return bankCardNumber;
@@ -483,7 +488,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.bank_card_number
 	 * @param bankCardNumber  the value for user_identity.bank_card_number
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
@@ -492,7 +497,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.amount_money
 	 * @return  the value of user_identity.amount_money
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
@@ -501,7 +506,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.amount_money
 	 * @param amountMoney  the value for user_identity.amount_money
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
@@ -510,7 +515,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.audit_status
 	 * @return  the value of user_identity.audit_status
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -519,7 +524,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.audit_status
 	 * @param auditStatus  the value for user_identity.audit_status
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -528,7 +533,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.process
 	 * @return  the value of user_identity.process
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getProcess() {
 		return process;
@@ -537,7 +542,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.process
 	 * @param process  the value for user_identity.process
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -546,7 +551,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.wrong_count
 	 * @return  the value of user_identity.wrong_count
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getWrongCount() {
 		return wrongCount;
@@ -555,7 +560,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.wrong_count
 	 * @param wrongCount  the value for user_identity.wrong_count
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
@@ -564,7 +569,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.payment_date
 	 * @return  the value of user_identity.payment_date
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Date getPaymentDate() {
 		return paymentDate;
@@ -573,7 +578,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.payment_date
 	 * @param paymentDate  the value for user_identity.payment_date
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
@@ -582,7 +587,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.expert
 	 * @return  the value of user_identity.expert
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getExpert() {
 		return expert;
@@ -591,7 +596,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.expert
 	 * @param expert  the value for user_identity.expert
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setExpert(Integer expert) {
 		this.expert = expert;
@@ -600,7 +605,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.celebrity
 	 * @return  the value of user_identity.celebrity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getCelebrity() {
 		return celebrity;
@@ -609,7 +614,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.celebrity
 	 * @param celebrity  the value for user_identity.celebrity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setCelebrity(Integer celebrity) {
 		this.celebrity = celebrity;
@@ -618,7 +623,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.international
 	 * @return  the value of user_identity.international
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getInternational() {
 		return international;
@@ -627,7 +632,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.international
 	 * @param international  the value for user_identity.international
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setInternational(Integer international) {
 		this.international = international;
@@ -636,7 +641,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.fixed_tel
 	 * @return  the value of user_identity.fixed_tel
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -645,7 +650,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.fixed_tel
 	 * @param fixedTel  the value for user_identity.fixed_tel
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -654,7 +659,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.qq
 	 * @return  the value of user_identity.qq
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -663,7 +668,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.qq
 	 * @param qq  the value for user_identity.qq
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -672,7 +677,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postal_address
 	 * @return  the value of user_identity.postal_address
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getPostalAddress() {
 		return postalAddress;
@@ -681,7 +686,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postal_address
 	 * @param postalAddress  the value for user_identity.postal_address
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
@@ -690,7 +695,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.postcode
 	 * @return  the value of user_identity.postcode
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getPostcode() {
 		return postcode;
@@ -699,7 +704,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.postcode
 	 * @param postcode  the value for user_identity.postcode
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setPostcode(String postcode) {
 		this.postcode = postcode;
@@ -708,7 +713,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.review_instructions
 	 * @return  the value of user_identity.review_instructions
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getReviewInstructions() {
 		return reviewInstructions;
@@ -717,7 +722,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.review_instructions
 	 * @param reviewInstructions  the value for user_identity.review_instructions
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setReviewInstructions(String reviewInstructions) {
 		this.reviewInstructions = reviewInstructions;
@@ -726,7 +731,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.industry
 	 * @return  the value of user_identity.industry
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getIndustry() {
 		return industry;
@@ -735,7 +740,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.industry
 	 * @param industry  the value for user_identity.industry
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
@@ -744,7 +749,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.contacts
 	 * @return  the value of user_identity.contacts
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getContacts() {
 		return contacts;
@@ -753,7 +758,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.contacts
 	 * @param contacts  the value for user_identity.contacts
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -762,7 +767,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.email
 	 * @return  the value of user_identity.email
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -771,7 +776,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.email
 	 * @param email  the value for user_identity.email
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -780,7 +785,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.professional_title
 	 * @return  the value of user_identity.professional_title
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getProfessionalTitle() {
 		return professionalTitle;
@@ -789,7 +794,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.professional_title
 	 * @param professionalTitle  the value for user_identity.professional_title
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setProfessionalTitle(String professionalTitle) {
 		this.professionalTitle = professionalTitle;
@@ -798,7 +803,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.work_unit
 	 * @return  the value of user_identity.work_unit
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getWorkUnit() {
 		return workUnit;
@@ -807,7 +812,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.work_unit
 	 * @param workUnit  the value for user_identity.work_unit
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setWorkUnit(String workUnit) {
 		this.workUnit = workUnit;
@@ -816,7 +821,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.education
 	 * @return  the value of user_identity.education
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getEducation() {
 		return education;
@@ -825,7 +830,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.education
 	 * @param education  the value for user_identity.education
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setEducation(String education) {
 		this.education = education;
@@ -834,7 +839,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.major_category
 	 * @return  the value of user_identity.major_category
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getMajorCategory() {
 		return majorCategory;
@@ -843,7 +848,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.major_category
 	 * @param majorCategory  the value for user_identity.major_category
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setMajorCategory(String majorCategory) {
 		this.majorCategory = majorCategory;
@@ -852,7 +857,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.qualification
 	 * @return  the value of user_identity.qualification
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getQualification() {
 		return qualification;
@@ -861,7 +866,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.qualification
 	 * @param qualification  the value for user_identity.qualification
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setQualification(String qualification) {
 		this.qualification = qualification;
@@ -870,7 +875,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.investment
 	 * @return  the value of user_identity.investment
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Integer getInvestment() {
 		return investment;
@@ -879,7 +884,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.investment
 	 * @param investment  the value for user_identity.investment
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setInvestment(Integer investment) {
 		this.investment = investment;
@@ -888,7 +893,7 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.graduate_school
 	 * @return  the value of user_identity.graduate_school
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getGraduateSchool() {
 		return graduateSchool;
@@ -897,9 +902,27 @@ public class UserIdentity {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.graduate_school
 	 * @param graduateSchool  the value for user_identity.graduate_school
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setGraduateSchool(String graduateSchool) {
 		this.graduateSchool = graduateSchool;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.consultant
+	 * @return  the value of user_identity.consultant
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
+	 */
+	public Integer getConsultant() {
+		return consultant;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.consultant
+	 * @param consultant  the value for user_identity.consultant
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
+	 */
+	public void setConsultant(Integer consultant) {
+		this.consultant = consultant;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class UserIdentityExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public UserIdentityExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class UserIdentityExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2763,11 +2763,71 @@ public class UserIdentityExample {
 			addCriterion("graduate_school not between", value1, value2, "graduateSchool");
 			return (Criteria) this;
 		}
+
+		public Criteria andConsultantIsNull() {
+			addCriterion("consultant is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIsNotNull() {
+			addCriterion("consultant is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantEqualTo(Integer value) {
+			addCriterion("consultant =", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantNotEqualTo(Integer value) {
+			addCriterion("consultant <>", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantGreaterThan(Integer value) {
+			addCriterion("consultant >", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantGreaterThanOrEqualTo(Integer value) {
+			addCriterion("consultant >=", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantLessThan(Integer value) {
+			addCriterion("consultant <", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantLessThanOrEqualTo(Integer value) {
+			addCriterion("consultant <=", value, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantIn(List<Integer> values) {
+			addCriterion("consultant in", values, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantNotIn(List<Integer> values) {
+			addCriterion("consultant not in", values, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantBetween(Integer value1, Integer value2) {
+			addCriterion("consultant between", value1, value2, "consultant");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultantNotBetween(Integer value1, Integer value2) {
+			addCriterion("consultant not between", value1, value2, "consultant");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 06 15:49:08 CST 2017
+	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 11 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -74,6 +74,9 @@ public class CustomerListIn {
 	/** 社会性质 **/
 	private String societyTag;
 	
+	/** 是否为咨询师 **/
+	private String consultant;
+	
 	public String getType() {
 		return type;
 	}
@@ -265,4 +268,12 @@ public class CustomerListIn {
 	public void setSocietyTag(String societyTag) {
 		this.societyTag = societyTag;
 	}
+
+	public String getConsultant() {
+		return consultant;
+	}
+
+	public void setConsultant(String consultant) {
+		this.consultant = consultant;
+	}
 }

+ 7 - 5
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -114,7 +114,7 @@ public class DemandListBo {
 	
 	private String orderIntentionCount; 
 	
-	
+	private String		industryCategoryAS;
 	
 
 	@JsonFormat(shape = Shape.STRING)
@@ -435,10 +435,12 @@ public class DemandListBo {
 		this.orderIntentionCount = orderIntentionCount;
 	}
 
-	
+	public String getIndustryCategoryAS() {
+		return industryCategoryAS;
+	}
 
-	
-	
-	
+	public void setIndustryCategoryAS(String industryCategoryAS) {
+		this.industryCategoryAS = industryCategoryAS;
+	}
 
 }

+ 44 - 25
src/main/java/com/goafanti/message/JGMessageHelper.java

@@ -16,11 +16,13 @@ import org.springframework.beans.factory.annotation.Value;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.message.bo.MessageAdapter;
 import com.goafanti.message.bo.MessageBo;
-import com.goafanti.message.push.model.Message;
 import com.goafanti.message.push.model.Platform;
 import com.goafanti.message.push.model.PushPayload;
 import com.goafanti.message.push.model.audience.Audience;
 import com.goafanti.message.push.model.audience.AudienceTarget;
+import com.goafanti.message.push.model.notification.AndroidNotification;
+import com.goafanti.message.push.model.notification.IosNotification;
+import com.goafanti.message.push.model.notification.Notification;
 import com.goafanti.message.queue.MessageRedisQueue;
 
 import cn.jiguang.common.ClientConfig;
@@ -35,9 +37,9 @@ import cn.jiguang.common.resp.ResponseWrapper;
  */
 public class JGMessageHelper implements InitializingBean, DisposableBean{
 	@Value(value = "${jiguang.appKey}")
-	private String appKey; 
+	private String appKey = "36944c5628d34ff997f56dcd"; 
 	@Value(value = "${jiguang.masterSecret}")
-	private String masterSecret;
+	private String masterSecret = "cceff6a22d91c06786bfdcd3";
 	@Value(value = "${jiguang.pushUrl}")
 	private String pushUrl;
 	@Autowired
@@ -52,17 +54,16 @@ public class JGMessageHelper implements InitializingBean, DisposableBean{
 	private static final String RESOURCE_TYPE = "resource_type";//资源类型
 	public void send(MessageAdapter messageAdapter){
 		ClientConfig clientConfig = ClientConfig.getInstance();
-	    String host = (String) clientConfig.get(ClientConfig.PUSH_HOST_NAME);
+	   String host = (String) clientConfig.get(ClientConfig.PUSH_HOST_NAME);
         final NettyHttpClient client = new NettyHttpClient(ServiceHelper.getBasicAuthorization(appKey, masterSecret), null, clientConfig);
         try {
             URI uri = new URI(host + clientConfig.get(ClientConfig.PUSH_PATH));
             PushPayload payload = messageAdapter.getPushPayload();
-           if(payload == null) System.out.println("*******************shit*********************");
-            System.out.println(payload.toJSON());
+            logger.info(payload.toJSON().toString());
             client.sendRequest(HttpMethod.POST, payload.toString(), uri, new NettyHttpClient.BaseCallback() {
                 @Override
                 public void onSucceed(ResponseWrapper responseWrapper) {
-                    logger.info("Got result: " + responseWrapper.responseContent);
+                    logger.info("Got result Content: " + responseWrapper.responseContent + "Code:" +responseWrapper.responseCode);
                     if(responseWrapper.responseCode == UN_AUTH){
                     	LoggerUtils.debug(logger, "Request Not Authorized");
                     }else if(responseWrapper.responseCode == NOT_SUITABLE){
@@ -94,13 +95,21 @@ public class JGMessageHelper implements InitializingBean, DisposableBean{
 							.addAudienceTarget(
 									AudienceTarget.registrationId(mb.getRegistrationId()))
 							.build())
-					.setMessage(Message.newBuilder()
-							.setTitle(mb.getMessageTitle())
-							.setMsgContent(mb.getMessageBody())
-							.addExtra(MESSAGE_ID,mb.getMessageId())
-							.addExtra(RESOURCE_ID,mb.getResourceId() == null ? "" : mb.getResourceId())
-							.addExtra(RESOURCE_TYPE, mb.getResourceType()== null ? "": mb.getResourceType())
-							.build())
+					.setNotification(Notification.newBuilder()
+			        		.setAlert(mb.getMessageTitle())
+			        		.addPlatformNotification(AndroidNotification.newBuilder()
+			        				.addExtra(MESSAGE_ID, mb.getMessageId())
+			        				.addExtra(RESOURCE_ID, mb.getResourceId() == null ? "" : mb.getResourceId())
+			        				.addExtra(RESOURCE_TYPE, mb.getResourceType()== null ? "": mb.getResourceType())
+			        				.build())
+			        		.addPlatformNotification(IosNotification.newBuilder()
+			        				.incrBadge(1)
+			        				.setContentAvailable(true)
+			        				.addExtra(MESSAGE_ID, mb.getMessageId())
+			        				.addExtra(RESOURCE_ID, mb.getResourceId() == null ? "" : mb.getResourceId())
+			        				.addExtra(RESOURCE_TYPE, mb.getResourceType()== null ? "": mb.getResourceType())
+			        				.build())
+			        		.build())
 					.build());
 			send(ma);
 		}
@@ -129,20 +138,30 @@ public class JGMessageHelper implements InitializingBean, DisposableBean{
 	}
 
 	public static void main(String[] args) {
-		PushPayload pp = PushPayload.newBuilder()
+		JGMessageHelper jgMessageHelper = new JGMessageHelper();
+		MessageAdapter ma = new MessageAdapter().pushPayload( 
+				PushPayload.newBuilder()
 		.setPlatform(Platform.android_ios())
 		.setAudience(Audience.newBuilder()
 				.addAudienceTarget(
-						AudienceTarget.registrationId("极光id"))
-				.build())
-		.setMessage(Message.newBuilder()
-				.setTitle("消息标题")
-				.setMsgContent("消息内容")
-				.addExtra(MESSAGE_ID,"消息id")
-				.addExtra(RESOURCE_ID,"资源id")
-				.addExtra(RESOURCE_TYPE, "资源类型")
+						AudienceTarget.registrationId("101d8559094270e0d78"))
 				.build())
-		.build();
-		System.out.println(pp.toString());
+		.setNotification(Notification.newBuilder()
+        		.setAlert("消息标题")
+        		.addPlatformNotification(AndroidNotification.newBuilder()
+        				.addExtra(MESSAGE_ID,"消息id")
+        				.addExtra(RESOURCE_ID,"资源id")
+        				.addExtra(RESOURCE_TYPE, "资源类型")
+        				.build())
+        		.addPlatformNotification(IosNotification.newBuilder()
+        				.incrBadge(1)
+        				.setContentAvailable(true)
+        				.addExtra(MESSAGE_ID,"消息id")
+        				.addExtra(RESOURCE_ID,"资源id")
+        				.addExtra(RESOURCE_TYPE, "资源类型")
+        				.build())
+        		.build())
+		.build());
+		jgMessageHelper.send(ma);
 	}
 }

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

@@ -33,7 +33,7 @@ public class OrderController extends CertifyApiController{
 	public Result toAddIntention(String commodityId,Integer commodityType){
 		Result res = new Result();
 		if(StringUtils.isBlank(commodityId) || null == commodityType){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"",""));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品编号和商品类型"));
 			return res;
 		}
 		if(!CommodityType.containsType(commodityType)){
@@ -132,7 +132,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
 			return res;
 		}
-		orderServiceImpl.payForFirst(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		orderServiceImpl.updatePayForFirst(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
 		return res;
 	}
 	
@@ -154,7 +154,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
 			return res;
 		}
-		orderServiceImpl.payForLast(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		orderServiceImpl.updatePayForLast(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
 		return res;
 	}
 	
@@ -167,9 +167,9 @@ public class OrderController extends CertifyApiController{
 	public Result fundingHistory(String orderNo,Integer pageNo,Integer pageSize) {
 		Result res = new Result();
 		if(StringUtils.isNotBlank(orderNo))
-			orderServiceImpl.selectFundingHistory(Long.valueOf(orderNo),pageNo,pageSize);
+			res.setData(orderServiceImpl.selectFundingHistory(Long.valueOf(orderNo),pageNo,pageSize));
 		else
-			orderServiceImpl.selectFundingHistory(null,pageNo,pageSize);
+			res.setData(orderServiceImpl.selectFundingHistory(null,pageNo,pageSize));
 		return res;
 	}
 	
@@ -185,7 +185,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		orderServiceImpl.applyForWithdraw(Long.valueOf(orderNo),remarks);
+		orderServiceImpl.updateApplyForWithdraw(Long.valueOf(orderNo),remarks);
 		return res;
 	}
 	
@@ -194,14 +194,14 @@ public class OrderController extends CertifyApiController{
 	 * @param orderNo
 	 * @return
 	 */
-	@RequestMapping(value = "/applyForCancel", method = RequestMethod.GET)
+	@RequestMapping(value = "/applyForCancel", method = RequestMethod.POST)
 	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));
+		orderServiceImpl.updateApplyForCancel(Long.valueOf(orderNo));
 		return res;
 	}
 	
@@ -218,7 +218,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		orderServiceImpl.confirmIntention(Long.valueOf(orderNo),confirm);
+		orderServiceImpl.updateConfirmIntention(Long.valueOf(orderNo),confirm);
 		return res;
 	}
 }

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

@@ -5,17 +5,17 @@ import java.util.Map;
 
 public enum OrderState {
 	/** 意向订单 **/
-	INTENTION(0,"INTENTION"),
+	INTENTION(0,"意向订单 "),
 	/** 交易中 **/
-	IN_TRADING(1,"IN_TRADING"),
+	IN_TRADING(1,"交易中"),
 	/** 等待支付 **/
-	WAIT_FOR_PAY(2,"WAIT_FOR_PAY"),
+	WAIT_FOR_PAY(2,"等待支付"),
 	/** 已完成 **/
-	COMPLETED(3,"COMPLETED"),
+	COMPLETED(3,"已完成"),
 	/** 已取消 **/
-	CANCELLED(4,"CANCELLED"),
+	CANCELLED(4,"已取消"),
 	/** 无效 **/
-	INVALID(10, "INVALID");
+	INVALID(10, "无效");
 	
 	private OrderState(Integer code, String desc) {
 		this.code = code;

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

@@ -37,7 +37,7 @@ public interface OrderService {
 	 * @param fundAmount 金额
 	 * @return remarks 备注
 	 */
-	int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks);
+	int updatePayForFirst(Long orderNo, BigDecimal fundAmount,String remarks);
 
 	/**
 	 * 支付尾款
@@ -46,7 +46,7 @@ public interface OrderService {
 	 * @param remarks 备注
 	 * @return
 	 */
-	int payForLast(Long orderNo, BigDecimal fundAmount, String remarks);
+	int updatePayForLast(Long orderNo, BigDecimal fundAmount, String remarks);
 
 	/**
 	 * 
@@ -74,14 +74,14 @@ public interface OrderService {
 	 * @param orderNo
 	 * @return
 	 */
-	int applyForWithdraw(Long orderNo,String remarks);
+	int updateApplyForWithdraw(Long orderNo,String remarks);
 
 	/**
 	 * 取消订单
 	 * @param orderNo
 	 * @return
 	 */
-	int applyForCancel(Long orderNo);
+	int updateApplyForCancel(Long orderNo);
 
 	/**
 	 * 确认意向订单
@@ -89,5 +89,5 @@ public interface OrderService {
 	 * @param confirm 是否确认
 	 * @return
 	 */
-	int confirmIntention(Long orderNo, boolean confirm);
+	int updateConfirmIntention(Long orderNo, boolean confirm);
 }

+ 25 - 13
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -59,7 +59,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	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_BROKERAGE_PROPORTION = 0; //佣金比例
 	private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
 	private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
 	@Override
@@ -98,7 +98,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setDeleteSign(Boolean.FALSE);
 		tOrder.setOrderChannel(OrderChannel.APP.getCode());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
-		return 0;
+		tOrderMapper.insert(tOrder);
+		return 1;
 	}
 	
 	/**
@@ -124,6 +125,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setLiquidationStatus(LiquidationSate.WAIT_FOR_PAY.getCode());
 			tOrder.setActuallyFirstPayment(new BigDecimal(0));
 			tOrder.setActuallyTotalPayment(new BigDecimal(0));
+			tOrder.setActuallyBrokerageAmount(new BigDecimal(0));
 		}else if(orderAction == OrderAction.CONFIRM_INTENTION){ //确认意向订单 (用户确认)
 			if(tOrder.getOrderStatus() != OrderState.INTENTION.getCode() 
 					|| tOrder.getIntentionStatus() != IntentionSate.WAIT_SELLER_CONFIRM.getCode()
@@ -153,7 +155,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					DecimalCalculate.add(tOrder.getActuallyFirstPayment().doubleValue(),changeAmount.doubleValue()),
 					tOrder.getFirstPayment().doubleValue());
 			if(boundary == 1){
-				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付首付"));
+				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())));
@@ -210,7 +212,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					|| 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,"提现确认"));
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认提现"));
 			}
 			tOrder.setLiquidationStatus(LiquidationSate.PAY_SETTLE.getCode());
 		}else if(orderAction == OrderAction.APPLY_FOR_CANCEL){ //取消订单(用户取消)
@@ -277,6 +279,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		records.setTransactionAmount(transactionAmount);
 		records.setTransactionMode(transactionMode.getCode());
 		records.setTransactionSubject(transactionSubject.getCode());
+		records.setTransactionChannel(payChannel.getCode());
 		tFundingRecordsMapper.insert(records);
 		return 1;
 	}
@@ -313,7 +316,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 						&& tOrder.getLiquidationStatus() == LiquidationSate.PART_PAY.getCode()) {
 					active.setPayForLast(true);
 				} else {
-					active.setPayForLast(true);
+					active.setPayForLast(false);
 				}
 				boolean flag = true;
 				if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
@@ -438,20 +441,20 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
+	public int updatePayForFirst(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);
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}
 
 	@Override
-	public int payForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
+	public int updatePayForLast(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);
+		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}
 
@@ -460,7 +463,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	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()); //购买意向
+		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();
@@ -527,12 +530,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
 			}
 		}
+		data.setList(list);
 		return data;
 	}
 
 	@Override
 	@Transactional
-	public int applyForWithdraw(Long orderNo,String remarks) {
+	public int updateApplyForWithdraw(Long orderNo,String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		BigDecimal transactionAmount = new BigDecimal(DecimalCalculate.sub(tOrder.getActuallyTotalPayment().doubleValue(), 
 				tOrder.getActuallyBrokerageAmount().doubleValue())); 
@@ -545,7 +549,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	public int applyForCancel(Long orderNo) {
+	public int updateApplyForCancel(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() 
@@ -559,6 +563,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		return 1;
 	}
 
+	/**
+	 * 
+	 * @param transactionSubject 交易科目
+	 * @param transactionAmount 交易金额
+	 * @param payeeId 收款人
+	 * @param payerId 付款人
+	 * @return
+	 */
 	private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
 		String result = "";
 		if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
@@ -570,7 +582,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int confirmIntention(Long orderNo, boolean confirm) {
+	public int updateConfirmIntention(Long orderNo, boolean confirm) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		setOrderState(OrderAction.CONFIRM_INTENTION, new BigDecimal(0), tOrder, confirm);
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);

+ 2 - 2
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -86,9 +86,9 @@ public class UserLoginController extends BaseController {
 		if (sr != null) {
 			jo.put("requestURI", sr.getRequestURI());
 			jo.put("queryString", sr.getQueryString());
-			jo.put("easemobName",ubi.getEasemobName());
-			jo.put("easemobPass",ubi.getEasemobPass());
 		}
+		jo.put("easemobName",ubi.getEasemobName());
+		jo.put("easemobPass",ubi.getEasemobPass());
 		res.setToken(SecurityUtils.getSubject().getSession().getId());
 		res.setData(jo);
 		// 发送推送消息

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -131,7 +131,7 @@ public class UserRegisterController extends BaseController {
 			resultObj.put("password", easemobPass);
 			resultObj.put("username", easemobName);
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			easemobUtils.sendLater(
+			easemobUtils.send(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -89,7 +89,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	}
 
 	@Override
-	public User selectByMobieAndType(java.lang.String mobile, Integer type) {
+	public User selectByMobieAndType(String mobile, Integer type) {
 		return userMapper.selectByMobieAndType(mobile, type);
 	}