Browse Source

冲突解决

anderx 8 years ago
parent
commit
ec6646ba3a

+ 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	int updateByPrimaryKey(UserIdentity record);
 

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

@@ -663,7 +663,8 @@
   			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 a.id as commodityId,a.nickname as commodityName,a.id as sellerId,0 as commodityPrice,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}
+  			select a.id as commodityId,a.nickname as commodityName,a.id as sellerId,ifnull(b.consultation_price,0) as commodityPrice,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">
   			
@@ -672,7 +673,8 @@
   		
   		</when>
   		<when test="commodityType == 6">
-  			select a.id as commodityId,a.nickname as commodityName,a.id as sellerId,0 as commodityPrice,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}
+  			select a.id as commodityId,a.nickname as commodityName,a.id as sellerId,ifnull(b.consultation_price,0) as commodityPrice,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>
   	</choose>
   </select>

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

@@ -446,7 +446,8 @@
 			b.investment,
 			b.audit_status as auditStatus,
 			b.graduate_school as graduateSchool,
-			b.consultant
+			b.consultant,
+			b.consultation_price as consultationPrice
 		from
 			(
 				select

+ 143 - 120
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -7,209 +7,214 @@ public class UserIdentity {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.id
-	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	private Integer consultant;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_identity.consultation_price
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
+	 */
+	private BigDecimal consultationPrice;
 
 	/**
 	 * 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -218,7 +223,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -227,7 +232,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -236,7 +241,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -245,7 +250,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getUsername() {
 		return username;
@@ -254,7 +259,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setUsername(String username) {
 		this.username = username;
@@ -263,7 +268,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -272,7 +277,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -281,7 +286,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
@@ -290,7 +295,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
@@ -299,7 +304,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
@@ -308,7 +313,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
@@ -317,7 +322,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getIdNumber() {
 		return idNumber;
@@ -326,7 +331,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
@@ -335,7 +340,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
@@ -344,7 +349,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
@@ -353,7 +358,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
@@ -362,7 +367,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
@@ -371,7 +376,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getProvince() {
 		return province;
@@ -380,7 +385,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -389,7 +394,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getCity() {
 		return city;
@@ -398,7 +403,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -407,7 +412,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getArea() {
 		return area;
@@ -416,7 +421,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -425,7 +430,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -434,7 +439,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -443,7 +448,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getBankName() {
 		return bankName;
@@ -452,7 +457,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
@@ -461,7 +466,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getBankAccount() {
 		return bankAccount;
@@ -470,7 +475,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
@@ -479,7 +484,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getBankCardNumber() {
 		return bankCardNumber;
@@ -488,7 +493,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
@@ -497,7 +502,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
@@ -506,7 +511,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
@@ -515,7 +520,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -524,7 +529,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
@@ -533,7 +538,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getProcess() {
 		return process;
@@ -542,7 +547,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -551,7 +556,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getWrongCount() {
 		return wrongCount;
@@ -560,7 +565,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
@@ -569,7 +574,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Date getPaymentDate() {
 		return paymentDate;
@@ -578,7 +583,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
@@ -587,7 +592,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getExpert() {
 		return expert;
@@ -596,7 +601,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setExpert(Integer expert) {
 		this.expert = expert;
@@ -605,7 +610,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getCelebrity() {
 		return celebrity;
@@ -614,7 +619,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setCelebrity(Integer celebrity) {
 		this.celebrity = celebrity;
@@ -623,7 +628,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getInternational() {
 		return international;
@@ -632,7 +637,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setInternational(Integer international) {
 		this.international = international;
@@ -641,7 +646,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -650,7 +655,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -659,7 +664,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -668,7 +673,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -677,7 +682,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getPostalAddress() {
 		return postalAddress;
@@ -686,7 +691,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
@@ -695,7 +700,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getPostcode() {
 		return postcode;
@@ -704,7 +709,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setPostcode(String postcode) {
 		this.postcode = postcode;
@@ -713,7 +718,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getReviewInstructions() {
 		return reviewInstructions;
@@ -722,7 +727,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setReviewInstructions(String reviewInstructions) {
 		this.reviewInstructions = reviewInstructions;
@@ -731,7 +736,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getIndustry() {
 		return industry;
@@ -740,7 +745,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
@@ -749,7 +754,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getContacts() {
 		return contacts;
@@ -758,7 +763,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -767,7 +772,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -776,7 +781,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -785,7 +790,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getProfessionalTitle() {
 		return professionalTitle;
@@ -794,7 +799,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setProfessionalTitle(String professionalTitle) {
 		this.professionalTitle = professionalTitle;
@@ -803,7 +808,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getWorkUnit() {
 		return workUnit;
@@ -812,7 +817,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setWorkUnit(String workUnit) {
 		this.workUnit = workUnit;
@@ -821,7 +826,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getEducation() {
 		return education;
@@ -830,7 +835,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setEducation(String education) {
 		this.education = education;
@@ -839,7 +844,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getMajorCategory() {
 		return majorCategory;
@@ -848,7 +853,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setMajorCategory(String majorCategory) {
 		this.majorCategory = majorCategory;
@@ -857,7 +862,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getQualification() {
 		return qualification;
@@ -866,7 +871,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setQualification(String qualification) {
 		this.qualification = qualification;
@@ -875,7 +880,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getInvestment() {
 		return investment;
@@ -884,7 +889,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setInvestment(Integer investment) {
 		this.investment = investment;
@@ -893,7 +898,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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public String getGraduateSchool() {
 		return graduateSchool;
@@ -902,7 +907,7 @@ 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setGraduateSchool(String graduateSchool) {
 		this.graduateSchool = graduateSchool;
@@ -911,7 +916,7 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public Integer getConsultant() {
 		return consultant;
@@ -920,9 +925,27 @@ public class UserIdentity {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public void setConsultant(Integer consultant) {
 		this.consultant = consultant;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_identity.consultation_price
+	 * @return  the value of user_identity.consultation_price
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
+	 */
+	public BigDecimal getConsultationPrice() {
+		return consultationPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_identity.consultation_price
+	 * @param consultationPrice  the value for user_identity.consultation_price
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
+	 */
+	public void setConsultationPrice(BigDecimal consultationPrice) {
+		this.consultationPrice = consultationPrice;
+	}
 }

+ 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 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 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2823,11 +2823,71 @@ public class UserIdentityExample {
 			addCriterion("consultant not between", value1, value2, "consultant");
 			return (Criteria) this;
 		}
+
+		public Criteria andConsultationPriceIsNull() {
+			addCriterion("consultation_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceIsNotNull() {
+			addCriterion("consultation_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceEqualTo(BigDecimal value) {
+			addCriterion("consultation_price =", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceNotEqualTo(BigDecimal value) {
+			addCriterion("consultation_price <>", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceGreaterThan(BigDecimal value) {
+			addCriterion("consultation_price >", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("consultation_price >=", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceLessThan(BigDecimal value) {
+			addCriterion("consultation_price <", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("consultation_price <=", value, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceIn(List<BigDecimal> values) {
+			addCriterion("consultation_price in", values, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceNotIn(List<BigDecimal> values) {
+			addCriterion("consultation_price not in", values, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("consultation_price between", value1, value2, "consultationPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andConsultationPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("consultation_price not between", value1, value2, "consultationPrice");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table user_identity
-	 * @mbg.generated  Wed Dec 27 16:44:24 CST 2017
+	 * @mbg.generated  Fri Dec 29 09:20:50 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -6,10 +6,10 @@ import java.util.Map;
 public enum OrderState {
 	/** 意向订单 **/
 	INTENTION(0,"意向订单 "),
-	/** 交易中 **/
-	IN_TRADING(1,"交易中"),
-	/** 等待支付 **/
-	WAIT_FOR_PAY(2,"等待支付"),
+	/** 等待支付首付款 **/
+	WAIT_FOR_FIRST_PAY(1,"等待支付首付"),
+	/** 等待支付尾款 **/
+	WAIT_FOR_LAST_PAY(2,"等待支付尾款"),
 	/** 已完成 **/
 	COMPLETED(3,"已完成"),
 	/** 已取消 **/

+ 35 - 9
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -142,7 +142,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认意向订单"));
 			}
 			if(confirm){
-				tOrder.setOrderStatus(OrderState.WAIT_FOR_PAY.getCode());
+				tOrder.setOrderStatus(OrderState.WAIT_FOR_FIRST_PAY.getCode());
 				tOrder.setIntentionStatus(IntentionSate.SELLER_CONFIRM.getCode());
 				tOrder.setTradingStatus(TradingState.ON_TRADE.getCode());
 			}else{
@@ -151,7 +151,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setTradingStatus(TradingState.TRADE_FAILED.getCode());
 			}
 		}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_FIRST){ // 支付首付(审核员先审核流水)
-			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
+			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_FIRST_PAY.getCode()
 					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
 					|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
 					|| tOrder.getPaymentStatus() != PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
@@ -171,6 +171,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setPaymentStatus(PaymentState.WAIT_PAY_FIRST_BALANCE.getCode());
 				tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode()); 
 			}else if(boundary == 0){ //首付已结清
+				tOrder.setOrderStatus(OrderState.WAIT_FOR_LAST_PAY.getCode());
 				tOrder.setActuallyTotalPayment(
 						new BigDecimal(DecimalCalculate.add(tOrder.getActuallyTotalPayment().doubleValue(), changeAmount.doubleValue())));
 				tOrder.setActuallyFirstPayment(
@@ -179,7 +180,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode());
 			}
 		}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核员先审核流水)
-			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
+			if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_LAST_PAY.getCode()
 					|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
 					|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
 					|| tOrder.getPaymentStatus() != PaymentState.ALREADY_FIRST_PAY.getCode()
@@ -308,7 +309,25 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				active.setConfirmIntention(false);
 				active.setRefuseIntention(false);
 				active.setApplyForWithdraw(false);
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+				if (tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
+						&& tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+						&& tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()
+						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
+						&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()) {
+					/** 需求订单 开始 **/
+					if (tOrder.getCommodityType() == CommodityType.DEMAND_PROVIDE.getTypeCode()) {
+						active.setConfirmIntention(true);
+						active.setRefuseIntention(true);
+					} else {
+						active.setConfirmIntention(false);
+						active.setRefuseIntention(false);
+					}
+					/** 需求订单 结束 **/
+				} else {
+					active.setConfirmIntention(false);
+					active.setRefuseIntention(false);
+				}
+				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_FIRST_PAY.getCode()
 						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
 						&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
 						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
@@ -317,7 +336,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				} else {
 					active.setPayForFirst(false);
 				}
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_LAST_PAY.getCode()
 						&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
 						&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
 						&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()
@@ -354,8 +373,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 						&& tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()
 						&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
 						&& tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_PAY.getCode()) {
-					active.setConfirmIntention(true);
-					active.setRefuseIntention(true);
+					/** 需求订单  开始**/
+					if(tOrder.getCommodityType() == CommodityType.DEMAND_PROVIDE.getTypeCode()){ 
+						active.setConfirmIntention(false);
+						active.setRefuseIntention(false);
+					}else{
+						active.setConfirmIntention(true);
+						active.setRefuseIntention(true);
+					}
+					/** 需求订单  结束**/
 				} else {
 					active.setConfirmIntention(false);
 					active.setRefuseIntention(false);
@@ -409,7 +435,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				active.setApplyForWithdraw(false);
 			}
 			//平台作为中间方  确认首付 -尾款-提现-退款
-			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_FIRST_PAY.getCode()
 					&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
 					&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
 					&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
@@ -418,7 +444,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}else{
 				active.setConfirmPayForFirst(false);
 			}
-			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
+			if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_LAST_PAY.getCode()
 					&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
 					&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
 					&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()