Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Michael 8 years ago
parent
commit
c6da4dd574
24 changed files with 589 additions and 261 deletions
  1. 4 0
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  2. 8 4
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 14 4
      src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java
  4. 1 1
      src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java
  5. 1 1
      src/main/java/com/goafanti/app/controller/AppApiController.java
  6. 13 5
      src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java
  7. 11 11
      src/main/java/com/goafanti/common/dao/UserIdentityMapper.java
  8. 98 18
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  9. 5 2
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  10. 37 19
      src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml
  11. 12 3
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  12. 38 23
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  13. 2 1
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  14. 143 120
      src/main/java/com/goafanti/common/model/UserIdentity.java
  15. 76 16
      src/main/java/com/goafanti/common/model/UserIdentityExample.java
  16. 2 2
      src/main/java/com/goafanti/message/service/MessageService.java
  17. 58 9
      src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java
  18. 9 0
      src/main/java/com/goafanti/order/bo/FundingListBo.java
  19. 2 0
      src/main/java/com/goafanti/order/enums/CommodityType.java
  20. 4 4
      src/main/java/com/goafanti/order/enums/OrderState.java
  21. 46 12
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  22. 1 5
      src/main/java/com/goafanti/user/controller/UserLoginController.java
  23. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  24. 3 0
      src/main/webapp/WEB-INF/views/portal/news/appCognizance.html

+ 4 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -91,5 +91,9 @@ public interface AchievementService {
 			Integer releaseStatus,String ownerId,Integer fieldA, Integer pNo, Integer pSize);
 
 	Pagination<AchievementPartnerListBo> listAppMyAchievement(Integer pNo, Integer pSize);
+
+	AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id);
+
+	
 	
 }

+ 8 - 4
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -400,8 +400,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	@Override
-	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
-		
+	public AchievementUserOwnerDetailBo selectAppUserOwnerDetail(String id) {
 		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
 		int i=achievementMapper.countInterest(a.getId());
 		a.setCountInterest(String.valueOf(i));
@@ -418,6 +417,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public AchievementOrgOwnerDetailBo selectOrgOwnerDetail(String id) {
 		return achievementMapper.selectOrgOwnerDetail(id);
 	}
+	
+	@Override
+	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
+		return achievementMapper.selectUserOwnerDetail(id);
+	}
 
 	@Override
 	public List<DemandAchievementListBo> selectAchievementDemandListByAchievementId(String id) {
@@ -728,8 +732,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
-		}
-		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
+		}																					
+		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAppAchievementListByPage", "findAppAchievementCount",
 				params,pNo, pSize);
 		
 		return p;

+ 14 - 4
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -263,8 +263,13 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		d.setUrgentDays(demand.getUrgentDays());
-		d.setUrgentMoney(demand.getUrgentMoney());
+		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
+			d.setUrgentDays(demand.getUrgentDays());
+		}
+		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
+			d.setUrgentMoney(demand.getUrgentMoney());
+		}
+			
 		
 		demandService.saveUserDemand(d, validityPeriodFormattedDate, keywords);
 		if (null != hot && hot == 1) { // 属于营销活动
@@ -425,8 +430,13 @@ public class AdminDemandApiController extends CertifyApiController {
 
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		d.setUrgentDays(demand.getUrgentDays());
-		d.setUrgentMoney(demand.getUrgentMoney());
+		BeanUtils.copyProperties(demand, d);
+		if (StringUtils.isNotBlank(demand.getUrgentDays())) {
+			d.setUrgentDays(demand.getUrgentDays());
+		}
+		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
+			d.setUrgentMoney(demand.getUrgentMoney());
+		}
 		res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
 		// 更新营销活动
 		MarketingManagement mm = marketingManagementService.selectMarket(MarketingPage.mainDemand.getPageUrl(),

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

@@ -157,7 +157,7 @@ public class AppAchievementDemandController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"成果必须指定","成果"));
 			return res;
 		}
-		res.setData(achievementService.selectUserOwnerDetail(id));
+		res.setData(achievementService.selectAppUserOwnerDetail(id));
 		return res;
 	}
 	/**

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

@@ -124,7 +124,7 @@ public class AppApiController extends BaseApiController {
 		}
 		User u = TokenManager.getUserToken();
 		if(u != null){
-			List<MessageBo> boList = messageService.selectSendMessage(u.getId()); 
+			List<MessageBo> boList = messageService.selectSyncMessage(u.getId()); 
 			if(boList != null && boList.size()>0){
 				List<MessageProducer> producers = new ArrayList<MessageProducer>();
 				List<MessageConsumer> consumers = new ArrayList<MessageConsumer>();

+ 13 - 5
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -80,7 +80,7 @@ public interface MessageFromSystemMapper {
 	int updateByPrimaryKey(MessageFromSystem record);
 
 	/**
-     * 查询发�?�目�??
+     * 查询发�?�目�??
      * @param sql
      * @return
      */
@@ -107,14 +107,22 @@ public interface MessageFromSystemMapper {
 	int insertBatchConsumer(List<MessageConsumer> target);
 	
 	/**
-	 * 查询单个用户的未发消��?
+	 * 同步消息
 	 * @param uid
 	 * @return
 	 */
-	List<MessageBo> selectSendMessage(@Param("uid")String uid);
+	List<MessageBo> selectSyncMessage(@Param("uid")String uid);
+	
+	
+	/**
+	 * 查询极光账号是否存在
+	 * @param uid
+	 * @return
+	 */
+	String selectJPushAcc(@Param("uid")String uid);
 
 	/**
-	 * 绑定第三方账?
+	 * 绑定第三方账�?
 	 * @param uuid
 	 * @param registrationId
 	 * @param userName
@@ -125,7 +133,7 @@ public interface MessageFromSystemMapper {
 			@Param("easemobName")String easemobName, @Param("easemobPass")String easemobPass, @Param("uid")String uid,@Param("lastLoginTime")Date lastLoginTime);
 	
 	/**
-	 * 把消息置为已�??
+	 * 把消息置为已�??
 	 * @param messageId
 	 * @param uid
 	 * @param readTime

+ 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);
 

+ 98 - 18
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1023,9 +1023,95 @@
 		#{item}
 	</foreach>
   </update>
+  	<select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  	
+	select 
+  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
+  		a.name, a.keyword, a.category, a.introduction,owner_postal_address as ownerPostalAddress,
+  		a.owner_name as ownerName, a.owner_type as ownerType, a.owner_mobile as ownerMobile,a.field_a as fieldA,a.field_b ,a.field_c as fieldC,
+  		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,f.name as field,f2.name as fieldB,ifnull(b.countInterest,0) as countInterest
+  	from achievement a
+  	left join (
+	select count(0)  as countInterest,achievement_id from achievement_interest group by achievement_id
+			)b on a.id = b.achievement_id 
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
+  	where deleted_sign = 0 
+	<if test="ownerId != null">
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="serialNumber != null">
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+
+		and  a.name = #{name,jdbcType=VARCHAR}
+
+	</if>
+	<if test="keyword != null">
+
+		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+
+	</if>
+	<if test="dataCategory != null and dataCategory != ''">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
+  	<if test="category != null">
+  		and a.category = #{category,jdbcType=INTEGER}
+  	</if>
+	<if test="ownerType != null">
+		and  a.owner_type = #{ownerType,jdbcType=INTEGER}
+	</if>
+	<if test="fieldA != null">
+		and a.field_a  = #{fieldA,jdbcType=VARCHAR}
+	</if>
+	<if test="status != null">
+		and  a.status = #{status,jdbcType=INTEGER}
+	</if>
+	<if test="rStart != null">
+       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and  a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="releaseStatus != null">
+	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
+	</if>
+	
+	order by serial_number desc
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
   
-   <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
+  		count(1)
+  	from achievement a
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
+  	where deleted_sign = 0 
+	<if test="ownerId != null">
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="serialNumber != null">
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+
+		and  a.name = #{name,jdbcType=VARCHAR}
+
+	</if>
+	</select>
+   <select id="findAppAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  	
+	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
   		a.name, a.keyword, a.category, a.introduction,owner_postal_address as ownerPostalAddress,
   		a.owner_name as ownerName, a.owner_type as ownerType, a.owner_mobile as ownerMobile,a.field_a as fieldA,a.field_b ,a.field_c as fieldC,
@@ -1037,6 +1123,7 @@
   	left join field_glossory f on a.field_a=f.id
   	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 
+  	and audit_status = 3
   	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
@@ -1087,13 +1174,14 @@
 	</if>
   </select>
   
-  <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
+  <select id="findAppAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   		count(1)
   	from achievement a
   	left join field_glossory f on a.field_a=f.id
   	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 
+  	and audit_status = 3
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
@@ -1151,26 +1239,16 @@
 		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
 		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
-		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,  a.international_flag as internationalFlag,
+		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
 		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
-		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, f.name as field1,f2.name as field2,
-		    a.create_time as createTime, a.release_status as releaseStatus, ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount,
+		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
+		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
-		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,j.easemob_name as easemobName,
-		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
+		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
+		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile
     from achievement a
-    left join jpush_easemob_account j on a.owner_id=j.uid
-    left join field_glossory f on a.field_a=f.id
-    left join field_glossory f2 on a.field_b=f2.id
     left join user_identity ui on a.owner_id = ui.uid
     left join user u on u.id = a.owner_id
-     left join (select count(0) as x,commodity_id from t_order
-				where order_status != 4
-				group by  commodity_id ) t on a.id=t.commodity_id
-    left join (select count(0) as x,commodity_id from t_order
-				where order_status != 4 and order_status != 0
-				group by  commodity_id ) t2 on a.id=t.commodity_id
-    left join marketing_management mm on a.id = mm.product_id
     where a.id = #{id,jdbcType=VARCHAR}
   </select>
   
@@ -1723,11 +1801,13 @@
   	 <select id="findMyAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
   	select 
 	  a.id, a.boutique,a.name, a.audit_status as auditStatus,ifnull(t.x,0) as buyIntention,
-	  a.release_date as releaseDate
+	  a.release_date as releaseDate,ifnull(i.y,0) as countInterest
 	from  achievement a 
 	left join (select count(0) as x,commodity_id from t_order
 				where order_status != 4
 				group by  commodity_id ) t on a.id=t.commodity_id 
+	left join (select count(0) as y,achievement_id from achievement_interest
+				group by achievement_id ) i on a.id=i.achievement_id	
 	where a.deleted_sign = 0
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}

+ 5 - 2
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1459,6 +1459,7 @@
 	left join (select count(0)  as countInterest ,demand_id from demand_interest 
 				group by demand_id) t on d.id=t.demand_id
 	where d.deleted_sign = 0 
+	and d.audit_status=3
 <if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
@@ -1558,13 +1559,15 @@
   </select>
   
   <select id="findAppMyDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
-  		select 
+  			select 
 	  d.id, d.boutique,d.name, d.audit_status as auditStatus,ifnull(t.x,0) as orderCount,
-	  d.release_date as releaseDate
+	  d.release_date as releaseDate,ifnull(i.y,0) as countInterest
 	from  demand d 
 	left join (select count(0) as x,commodity_id from t_order
 				where order_status != 4 and order_status != 0
 				group by  commodity_id ) t on d.id=t.commodity_id
+	left join (select count(0) as y,demand_id from demand_interest
+				group by demand_id ) i on d.id=i.demand_id	
 	where d.deleted_sign = 0 
 	<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}

+ 37 - 19
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -448,27 +448,45 @@
       )
     </foreach>
   </insert>
+   <select id="selectSyncMessage" parameterType="java.lang.String" resultType="com.goafanti.message.bo.MessageBo"> 
+   <!-- 登陆时同步  -->	
+			select
+				x.id,
+				x.message_id as messageId
+			from
+				message_producer x left join message_from_system y on
+				x.message_id = y.id
+			where x.id 
+				not in(
+					select
+						a.id
+					from
+						message_producer a inner join message_consumer b on
+						(
+							a.message_id = b.message_id
+							and a.consumer_id = b.consumer_id
+						)
+			)
+			and x.consumer_id = #{uid,jdbcType=VARCHAR}
+			and y.is_draft = 0 <!-- 非草稿 -->
+			and y.delete_sign = 0 <!-- 未删除 -->
+   </select>
+   
    <select id="selectSendMessage" parameterType="java.lang.String" resultType="com.goafanti.message.bo.MessageBo">
-		select
-			a.id,
-			a.message_id as messageId,
-			b.registration_id as registrationId,
-			c.resource_id as resourceId,
-			c.resource_type as resourceType,
-			c.title as messageTitle,
-			c.body as messageBody
-		from
-			message_producer a 
-		inner join 
-			jpush_easemob_account b on a.consumer_id = b.uid
-		left join
-			message_from_system c on a.message_id = c.id
+   <!-- 推送消息 -->
+		select c.id as messageId,c.title,c.body
+			from message_producer a inner join jpush_easemob_account b on
+			a.consumer_id = b.uid
+			left join message_from_system c on a.message_id = c.id
 		where
-			a.consumer_id = #{uid,jdbcType=VARCHAR}
-		 	<!-- and b.registration_id is not null -->
-			and a.send_time is null <!-- 未发送 -->
-			and c.is_draft = 0 <!-- 非草稿 -->
-			and c.delete_sign = 0 <!-- 未删除 -->
+			b.registration_id is not null
+			and a.consumer_id = #{uid,jdbcType=VARCHAR}
+			and c.is_draft = 0
+			and c.delete_sign = 0
+   </select>
+   
+   <select id="selectJPushAcc" parameterType="java.lang.String" resultType="java.lang.String">
+   		select registration_id from jpush_easemob_account where uid = #{uid,jdbcType=VARCHAR}
    </select>
    
    <update id="updateJpushEasemobAccount">

+ 12 - 3
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,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">
   			
@@ -671,6 +672,10 @@
   		<when test="commodityType == 5">
   		
   		</when>
+  		<when test="commodityType == 6">
+  			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>
   
@@ -686,6 +691,7 @@
     		and intention_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</otherwise>
     </choose>
+    order by create_time desc
     <if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -708,10 +714,12 @@
   <select id="selectFundingHistoryByPage" resultType="com.goafanti.order.bo.FundingListBo">
 	select
 		a.order_no as orderNo,
-		a.create_time as createTime,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
 		a.transaction_subject as transactionSubject,
 		a.transaction_amount as transactionAmount,
-		b.commodity_type as commodityType
+		b.commodity_id as commodityId,
+		b.commodity_type as commodityType,
+		a.confirm_sign as confirmSign
 	from
 		t_funding_records a left join t_order b on a.order_no = b.order_no
 	where
@@ -719,6 +727,7 @@
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>
+		order by a.create_time desc
 		<if test="page_sql!=null">
 			${page_sql}
 		</if>

+ 38 - 23
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 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -47,12 +47,13 @@
     <result column="investment" jdbcType="INTEGER" property="investment" />
     <result column="graduate_school" jdbcType="VARCHAR" property="graduateSchool" />
     <result column="consultant" jdbcType="INTEGER" property="consultant" />
+    <result column="consultation_price" jdbcType="DECIMAL" property="consultationPrice" />
   </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 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -86,7 +87,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -120,20 +121,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 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, consultant
+    investment, graduate_school, consultant, consultation_price
   </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 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select
     <if test="distinct">
@@ -152,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -163,7 +164,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -172,7 +173,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -183,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
@@ -198,7 +199,7 @@
       contacts, email, professional_title, 
       work_unit, education, major_category, 
       qualification, investment, graduate_school, 
-      consultant)
+      consultant, consultation_price)
     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}, 
@@ -212,13 +213,13 @@
       #{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}, 
-      #{consultant,jdbcType=INTEGER})
+      #{consultant,jdbcType=INTEGER}, #{consultationPrice,jdbcType=DECIMAL})
   </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 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -342,6 +343,9 @@
       <if test="consultant != null">
         consultant,
       </if>
+      <if test="consultationPrice != null">
+        consultation_price,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -464,13 +468,16 @@
       <if test="consultant != null">
         #{consultant,jdbcType=INTEGER},
       </if>
+      <if test="consultationPrice != null">
+        #{consultationPrice,jdbcType=DECIMAL},
+      </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 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -481,7 +488,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     <set>
@@ -605,6 +612,9 @@
       <if test="record.consultant != null">
         consultant = #{record.consultant,jdbcType=INTEGER},
       </if>
+      <if test="record.consultationPrice != null">
+        consultation_price = #{record.consultationPrice,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -614,7 +624,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -656,7 +666,8 @@
       qualification = #{record.qualification,jdbcType=VARCHAR},
       investment = #{record.investment,jdbcType=INTEGER},
       graduate_school = #{record.graduateSchool,jdbcType=VARCHAR},
-      consultant = #{record.consultant,jdbcType=INTEGER}
+      consultant = #{record.consultant,jdbcType=INTEGER},
+      consultation_price = #{record.consultationPrice,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -665,7 +676,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     <set>
@@ -786,6 +797,9 @@
       <if test="consultant != null">
         consultant = #{consultant,jdbcType=INTEGER},
       </if>
+      <if test="consultationPrice != null">
+        consultation_price = #{consultationPrice,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -793,7 +807,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -834,7 +848,8 @@
       qualification = #{qualification,jdbcType=VARCHAR},
       investment = #{investment,jdbcType=INTEGER},
       graduate_school = #{graduateSchool,jdbcType=VARCHAR},
-      consultant = #{consultant,jdbcType=INTEGER}
+      consultant = #{consultant,jdbcType=INTEGER},
+      consultation_price = #{consultationPrice,jdbcType=DECIMAL}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -1072,13 +1087,13 @@
     </if>
   </select>
   
-  <select id="countInterest"  resultType="java.lang.Integer">
+  <select id="countInterest" resultType="java.lang.Integer">
   select count(0)
   	from user_interest 
   	where to_uid=#{uid,jdbcType=VARCHAR}
   </select>
   
-  <select id= "findConsultantListByPage"  resultType="com.goafanti.app.bo.consultantListBo" >
+  <select id="findConsultantListByPage" resultType="com.goafanti.app.bo.consultantListBo">
   select t.uid as id,u.nickname as username ,u.head_portrait_url as headPortraitUrl,u.introduction ,t.consultant
   from user_identity t
   left join `user` u on t.uid=u.id
@@ -1088,7 +1103,7 @@
 	</if>
   </select>
   
-  <select id = "findConsultantCount"  resultType="java.lang.Integer">
+  <select id="findConsultantCount" resultType="java.lang.Integer">
    	select count(0) 
   from user_identity t
   left join `user` u on t.uid=u.id

+ 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;

+ 2 - 2
src/main/java/com/goafanti/message/service/MessageService.java

@@ -48,11 +48,11 @@ public interface MessageService {
 	int insertSystemMessage(Map<Integer, String> targetMap,Integer targetType,String title, String body, Integer subject,Date createTime,Integer isDraft);
 	
 	/**
-	 * 查询用户的未发消息
+	 * 同步消息
 	 * @param uid
 	 * @return
 	 */
-	List<MessageBo> selectSendMessage(String uid);
+	List<MessageBo> selectSyncMessage(String uid);
 	
 	/**
 	 * 更新消息表

+ 58 - 9
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -27,6 +27,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.message.JGMessageHelper;
 import com.goafanti.message.bo.MessageBo;
 import com.goafanti.message.bo.MessageListBo;
 import com.goafanti.message.enums.ConsumerType;
@@ -42,6 +43,8 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	private MessageProducerMapper messageProducerMapper;
 	@Autowired
 	private JpushEasemobAccountMapper jpushEasemobAccountMapper;
+	@Autowired
+	private JGMessageHelper jgMessageHelper;
 	@Override
 	public String selectSendUser(Map<Integer, String> selectMap,Integer type) {
 		if(selectMap.containsKey(ConsumerType.PERSON_CUSTOMER_RETAIL.getTypeCode())){ //客户散户
@@ -151,36 +154,66 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 			mfs.setProducerId(admin.getId());
 		}
 		messageFromSystemMapper.insert(mfs);
-		List<MessageProducer> target = new ArrayList<MessageProducer>();
+		List<MessageProducer> producerTarget = new ArrayList<MessageProducer>();
+		List<MessageBo> sendTarget = new ArrayList<MessageBo>();
 		String[] cids;
 		if(subject == SubjectType.KE_HU.getTypeCode()){
 			String tmp = selectSendUser(targetMap,targetType);
 			if(tmp !=null){
 				cids = tmp.split(",");
 				MessageProducer mp;
+				MessageBo bo;
+				String registrationId = "";
 				for(String cid : cids){
 					mp = new MessageProducer();
 					mp.setId(UUID.randomUUID().toString());
 					mp.setMessageId(mfs.getId());
 					mp.setConsumerId(cid);
-					target.add(mp);
+					mp.setCreateTime(createTime);
+					mp.setSendTime(createTime);
+					producerTarget.add(mp);
+					registrationId = messageFromSystemMapper.selectJPushAcc(cid);
+					if(StringUtils.isNotBlank(registrationId)){
+						bo = new MessageBo();
+						bo.setMessageId(mfs.getId());
+						bo.setMessageTitle(mfs.getTitle());
+						bo.setMessageBody(mfs.getBody());
+						bo.setRegistrationId(registrationId);
+						sendTarget.add(bo);
+					}
 				}
 			}
-				if(target.size()>0) insertBatchProducer(target);					
+			if(producerTarget.size()>0) insertBatchProducer(producerTarget);	
+			//推送消息
 		}else if(subject == SubjectType.YUN_YING.getTypeCode()){
 			String tmp = selectSendUser(targetMap,targetType);
 			if(tmp !=null){
 				cids = tmp.split(",");
 				MessageProducer mp;
+				MessageBo bo;
+				String registrationId = "";
 				for(String cid : cids){
 					mp = new MessageProducer();
 					mp.setId(UUID.randomUUID().toString());
 					mp.setMessageId(mfs.getId());
 					mp.setConsumerId(cid);
-					target.add(mp);
+					mp.setCreateTime(createTime);
+					mp.setSendTime(createTime);
+					producerTarget.add(mp);
+					registrationId = messageFromSystemMapper.selectJPushAcc(cid);
+					if(StringUtils.isNotBlank(registrationId)){
+						bo = new MessageBo();
+						bo.setMessageId(mfs.getId());
+						bo.setMessageTitle(mfs.getTitle());
+						bo.setMessageBody(mfs.getBody());
+						bo.setRegistrationId(registrationId);
+						sendTarget.add(bo);
+					}
 				}
 			}			
-			if(target.size()>0) insertBatchProducer(target);
+			if(producerTarget.size()>0) insertBatchProducer(producerTarget);
+			//推送消息
+			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		}
 		return 1;
 	}
@@ -192,6 +225,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		List<MessageFromSystem> mfsList = selectRecommend(sourceMap, sourceType);
 		List<MessageProducer> producerTarget = new ArrayList<MessageProducer>();
 		List<MessageFromSystem> messageTarget = new ArrayList<MessageFromSystem>();
+		List<MessageBo> sendTarget = new ArrayList<MessageBo>();
 		if(mfsList != null && mfsList.size()>0){
 			MessageFromSystem message = null;
 			for(MessageFromSystem mfs : mfsList){
@@ -218,18 +252,31 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 				//插入消息推送表
 				if(subject == SubjectType.KE_HU.getTypeCode()||subject == SubjectType.TUI_JIAN.getTypeCode()){ //只推客户
 					MessageProducer mp = null;
+					MessageBo bo = null;
 					String tmp = selectSendUser(targetMap,targetType);
 					String[] cids = null;
 					if(tmp != null){
 						cids = tmp.split(",");
-						System.out.println("cids=="+cids);
+						String registrationId = "";
 						for(String cid : cids){
 							mp = new MessageProducer();
 							mp.setId(UUID.randomUUID().toString());
 							mp.setConsumerId(cid);
-							mp.setCreateTime(createTime);
 							mp.setMessageId(messageId);
+							mp.setCreateTime(createTime);
+							mp.setSendTime(createTime);
 							producerTarget.add(mp);
+							registrationId = messageFromSystemMapper.selectJPushAcc(cid);
+							if(StringUtils.isNotBlank(registrationId)){
+								bo = new MessageBo();
+								bo.setMessageId(message.getId());
+								bo.setMessageTitle(message.getTitle());
+								bo.setMessageBody(message.getBody());
+								bo.setResourceId(message.getResourceId());
+								bo.setResourceType(String.valueOf(message.getResourceType()));
+								bo.setRegistrationId(registrationId);
+								sendTarget.add(bo);
+							}
 						}
 					}
 				}
@@ -237,14 +284,16 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 			//批量插入
 			if(messageTarget.size()>0) messageFromSystemMapper.insertBatchMessage(messageTarget);
 			if(producerTarget.size()>0) messageFromSystemMapper.insertBatchProducer(producerTarget);
+			//推送消息
+			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 			return 1;
 		}
 		return 0;
 	}
 	
 	@Override
-	public List<MessageBo> selectSendMessage(String uid) {
-		return messageFromSystemMapper.selectSendMessage(uid);
+	public List<MessageBo> selectSyncMessage(String uid) {
+		return messageFromSystemMapper.selectSyncMessage(uid);
 	}
 	
 	@Override

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

@@ -19,6 +19,9 @@ public class FundingListBo {
 	private BigDecimal transactionAmount;
 	/** 业务描述  收入 与 支出**/
 	private String businessDesc;
+	/** 确认标示 **/
+	private Integer confirmSign;
+	
 	public String getOrderNo() {
 		return orderNo;
 	}
@@ -67,4 +70,10 @@ public class FundingListBo {
 	public void setBusinessDesc(String businessDesc) {
 		this.businessDesc = businessDesc;
 	}
+	public Integer getConfirmSign() {
+		return confirmSign;
+	}
+	public void setConfirmSign(Integer confirmSign) {
+		this.confirmSign = confirmSign;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/order/enums/CommodityType.java

@@ -16,6 +16,8 @@ public enum CommodityType {
 	ACTIVITY_APPLY(4,"ACTIVITY_APPLY"),
 	/** 会员升级 **/
 	MEMBER_UPGRADE(5,"MEMBER_UPGRADE"),
+	/** 咨询师 **/
+	CONSULTANT(6,"CONSULTANT"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	private CommodityType(Integer typeCode, String typeName) {

+ 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,"已完成"),
 	/** 已取消 **/

+ 46 - 12
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -34,6 +34,7 @@ import com.goafanti.order.bo.FundingListBo;
 import com.goafanti.order.bo.OperatorActive;
 import com.goafanti.order.bo.OrderDetailBo;
 import com.goafanti.order.enums.AuditState;
+import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.IntentionSate;
 import com.goafanti.order.enums.LiquidationSate;
 import com.goafanti.order.enums.OrderAction;
@@ -68,7 +69,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		bo.setOrderNo(String.valueOf(idGenerator.generateId()));
 		bo.setCreateTime(DateUtils.formatDate(new Date(),AFTConstants.YYYYMMDDHHMMSS));
 		bo.setCommodityType(commodityType);
-		if(StringUtils.isBlank(bo.getFirstPayment())) bo.setFirstPayment(String.valueOf(DEFAULT_FIRST_PAYMENT.doubleValue()));
+		if(StringUtils.isBlank(bo.getFirstPayment())) 
+			bo.setFirstPayment(String.valueOf(DEFAULT_FIRST_PAYMENT.doubleValue()));
 		return bo;
 	}
 
@@ -84,8 +86,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setCommodityId(commodityId);
 		tOrder.setCreater(TokenManager.getUserToken().getNickname());
 		tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
-		tOrder.setBuyerId(TokenManager.getUserId());
-		tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+		if(commodityType == CommodityType.DEMAND_PROVIDE.getTypeCode()){
+			tOrder.setBuyerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+			tOrder.setSellerId(TokenManager.getUserId());
+		}else{
+			tOrder.setBuyerId(TokenManager.getUserId());
+			tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
+		}
 		tOrder.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
 		tOrder.setCommodityType(commodityType);
 		tOrder.setCommodityQuantity(commodityQuantity);
@@ -135,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{
@@ -144,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()
@@ -164,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(
@@ -172,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()
@@ -280,6 +288,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		records.setTransactionMode(transactionMode.getCode());
 		records.setTransactionSubject(transactionSubject.getCode());
 		records.setTransactionChannel(payChannel.getCode());
+		records.setCreateTime(new Date());
 		tFundingRecordsMapper.insert(records);
 		return 1;
 	}
@@ -300,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()
@@ -309,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()
@@ -346,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);
@@ -401,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()
@@ -410,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()

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

@@ -34,7 +34,6 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.message.JGMessageHelper;
 import com.goafanti.message.bo.MessageBo;
 import com.goafanti.message.service.MessageService;
 import com.goafanti.user.service.UserService;
@@ -47,8 +46,6 @@ public class UserLoginController extends BaseController {
 	private AdminMapper			adminMapper;
 	@Resource
 	private MessageService messageService;
-	@Resource
-	private JGMessageHelper jgMessageHelper;
 	
 	@RequestMapping(value = "/login", method = RequestMethod.GET)
 	@ResponseBody
@@ -155,9 +152,8 @@ public class UserLoginController extends BaseController {
 		//更新 message_producer
 		User u = TokenManager.getUserToken();
 		if(u != null){
-			List<MessageBo> boList = messageService.selectSendMessage(u.getId()); 
+			List<MessageBo> boList = messageService.selectSyncMessage(u.getId()); 
 			if(boList != null && boList.size()>0){
-				jgMessageHelper.sendSystemMessage(boList);
 				List<MessageProducer> producers = new ArrayList<MessageProducer>();
 				List<MessageConsumer> consumers = new ArrayList<MessageConsumer>();
 				MessageProducer mp = null;

+ 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.send(
+			easemobUtils.sendLater(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);

+ 3 - 0
src/main/webapp/WEB-INF/views/portal/news/appCognizance.html

@@ -14,6 +14,9 @@
 			<img th:src="${portalHost + '/img/appCognizance01.jpg'}"  alt="高企认定" id="imgs"/>
 			<div class="contant">
 				<div class="service">
+					<h3 id="dataName"></h3>
+				</div>
+				<div class="service">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}"  alt="" /><span>项目描述</span></h3>
 					<hr>
 					<div class="promiseText" id="describe">