Przeglądaj źródła

Merge branch 'master' of ssh://git@git.jishutao.com:55555/jishutao/jitao-server

liliang4869 7 lat temu
rodzic
commit
5e23fe3f84
35 zmienionych plików z 694 dodań i 2575 usunięć
  1. 0 29
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 0 24
      src/main/java/com/goafanti/admin/controller/AdminHomePageApiController.java
  3. 1 1
      src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java
  4. 0 12
      src/main/java/com/goafanti/app/controller/AppDiscoveryController.java
  5. 1 13
      src/main/java/com/goafanti/app/controller/AppUserController.java
  6. 0 14
      src/main/java/com/goafanti/app/controller/OpenAppUserController.java
  7. 2 0
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  8. 0 982
      src/main/java/com/goafanti/common/controller/PortalController.java
  9. 4 0
      src/main/java/com/goafanti/common/dao/OrganizationContactBookMapper.java
  10. 0 56
      src/main/java/com/goafanti/common/dao/UserMapper.java
  11. 19 8
      src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml
  12. 32 11
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  13. 28 7
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  14. 23 406
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  15. 0 63
      src/main/java/com/goafanti/portal/controller/PortalFinancialController.java
  16. 110 10
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  17. 114 48
      src/main/java/com/goafanti/user/bo/InputUserIdentity.java
  18. 0 14
      src/main/java/com/goafanti/user/bo/OrgIdentityBo.java
  19. 0 186
      src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java
  20. 0 5
      src/main/java/com/goafanti/user/bo/StarAndExpertListBo.java
  21. 0 88
      src/main/java/com/goafanti/user/bo/StarListBo.java
  22. 12 0
      src/main/java/com/goafanti/user/bo/UserContactBo.java
  23. 1 145
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  24. 71 71
      src/main/java/com/goafanti/user/bo/UserPageHomeBo.java
  25. 184 75
      src/main/java/com/goafanti/user/controller/UserApiController.java
  26. 0 104
      src/main/java/com/goafanti/user/controller/UserPartnerApiController.java
  27. 0 5
      src/main/java/com/goafanti/user/service/UserCareerService.java
  28. 18 0
      src/main/java/com/goafanti/user/service/UserContactService.java
  29. 2 2
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  30. 0 21
      src/main/java/com/goafanti/user/service/UserService.java
  31. 57 0
      src/main/java/com/goafanti/user/service/impl/UserContactServiceImpl.java
  32. 5 6
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  33. 2 2
      src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java
  34. 5 166
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  35. 3 1
      src/main/resources/props/error.properties

+ 0 - 29
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -29,7 +29,6 @@ import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserLevel;
-import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
@@ -87,34 +86,6 @@ public class AdminApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 管理员"我的客户"列表
-	 */
-	@RequestMapping(value = "/customer", method = RequestMethod.GET)
-	public Result getCustomer(Integer number, String mobile, Integer auditStatus, String auditName, String email,
-			String startCreateTime, String endCreateTime, Integer type, String pageNo, String pageSize) {
-		Result res = new Result();
-		if (null == type) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户类型", "用户类型"));
-			return res;
-		}
-		if (!UserType.PERSONAL.getCode().equals(type) && !UserType.ORGANIZATION.getCode().equals(type)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "用户类型", "用户类型"));
-			return res;
-		}
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(userService.selectUserByAid(number, mobile, auditStatus, auditName, email,
-				TokenManager.getAdminId(), startCreateTime, endCreateTime, type, pNo, pSize));
-		return res;
-	}
-
-	/**
 	 * 管理员本人信息详情
 	 */
 	@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)

+ 0 - 24
src/main/java/com/goafanti/admin/controller/AdminHomePageApiController.java

@@ -1,24 +0,0 @@
-package com.goafanti.admin.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.goafanti.common.bo.Result;
-
-@RestController
-@RequestMapping(value = "/api/admin/homePage")
-public class AdminHomePageApiController {
-	/**
-	 * 首页业务数量统计(进行中/已完成)
-	 * @return
-	 */
-	@RequestMapping(value = "/count", method = RequestMethod.GET)
-	public Result count(){
-		Result res = new Result();
-		//Map<String, Integer> map = new TreeMap<String, Integer>();
-		
-		return res;
-	}
-}

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java

@@ -180,7 +180,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 	 * 审核员审核团体用户信息
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
-	public Result diposeOrg(@Valid InputOrganizationIdentity orgIdentity, BindingResult bindingResult,
+	public Result updateOrgDetail(@Valid InputOrganizationIdentity orgIdentity, BindingResult bindingResult,
 			String paymentDateFormattedDate, String aid, String mid) {
 		Result res = new Result();
 

+ 0 - 12
src/main/java/com/goafanti/app/controller/AppDiscoveryController.java

@@ -100,16 +100,6 @@ public class AppDiscoveryController extends BaseApiController {
 		return res;
 	}
 	/**
-	 * 专家列表
-	 */
-	@RequestMapping(value = "/expertsList", method = RequestMethod.GET)
-	public Result expertsList(String name,String industry, Integer pNo, Integer pSize) {
-		Result res = new Result();
-		res.setData(userIdentityService.expertsList(name,industry,  pNo,  pSize));
-		return res;
-	}
-	
-	/**
 	 * 发现页面广告
 	 */
 	@RequestMapping(value = "/advertising", method = RequestMethod.GET)
@@ -119,8 +109,6 @@ public class AppDiscoveryController extends BaseApiController {
 		return res;
 	}
 	
-
-	
 	/**
 	 * 政策列表
 	 */

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

@@ -304,19 +304,7 @@ public class AppUserController extends BaseApiController {
 		res.setData(demandService.selectinterest(type, pNo, pSize));
 		return res;
 	}
-	/**
-	 * 专家详情
-	 */
-	@RequestMapping(value = "/expertsDetail", method = RequestMethod.GET)
-	public Result expertsDetail(String uid) {
-		Result res = new Result();
-		if (StringUtils.isBlank(uid)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"专家必须指定","专家"));
-			return res;
-		}
-		res.setData(userIdentityService.expertsDetail( uid));
-		return res;
-	}
+	
 	/**
 	 * 成果详情
 	 * @param id

+ 0 - 14
src/main/java/com/goafanti/app/controller/OpenAppUserController.java

@@ -47,20 +47,6 @@ public class OpenAppUserController extends BaseApiController {
 	@Resource
 	AchievementInterestService achievementInterestService;
 	
-	
-	/**
-	 * 专家详情
-	 */
-	@RequestMapping(value = "/expertsDetail", method = RequestMethod.GET)
-	public Result expertsDetail(String uid) {
-		Result res = new Result();
-		if (StringUtils.isBlank(uid)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"专家必须指定","专家"));
-			return res;
-		}
-		res.setData(userIdentityService.expertsDetail( uid));
-		return res;
-	}
 	/**
 	 * 成果详情
 	 * @param id

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

@@ -141,4 +141,6 @@ public class ErrorConstants {
 	public static final String REFUND_BEYOND_SIGN					= "REFUND_BEYOND_SIGN";
 	
 	public static final String BILL_ALREADY_EXPIRE					= "BILL_ALREADY_EXPIRE";
+	
+	public static final String USER_CONTACT_ALREADY_EXIST           = "USER_CONTACT_ALREADY_EXIST";
 }

Plik diff jest za duży
+ 0 - 982
src/main/java/com/goafanti/common/controller/PortalController.java


+ 4 - 0
src/main/java/com/goafanti/common/dao/OrganizationContactBookMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationContactBookExample;
+import com.goafanti.user.bo.UserContactBo;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
@@ -81,4 +82,7 @@ public interface OrganizationContactBookMapper {
 	int updateMainContact(@Param("ocbId")String ocbId);
 	
 	int updateSubContact(@Param("uid")String uid);
+
+	List<UserContactBo> selectContactByUid(String uid);
+	
 }

+ 0 - 56
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -8,10 +8,8 @@ import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
-import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserPageHomeBo;
-import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.common.model.UserExample;
 
 public interface UserMapper {
@@ -85,75 +83,21 @@ public interface UserMapper {
 
 	UserDownLoadBo selectUserDownLoadBoByUserId(String id);
 
-	//List<OrgListBo> selectUserByAid(String aid);
-
 	String findUserByNameAndMobile(@Param("name") String name, @Param("mobile") String mobile);
 
 	String findOrgByNameAndMobile(@Param("name") String name, @Param("mobile") String mobile);
 
-	UserPartnerDetailBo findUserPartnerDetail(String uid);
-
-	OrgPartnerDetailBo findOrgPartnerDetail(String uid);
-
 	Long selectNumberByPrimaryKey(String userId);
 	
-	List<UserPartnerDetailBo> findUserPartner();
-	
 	User selectByMobieAndType(String mobile, Integer type);
 
-	/**
-	 * 查看客户账户信息
-	 * @param uid
-	 * @return
-	 */
-	User findUserAccountDetail(@Param("uid")String uid);
-
-	/**
-	 * 查看客户联系人列�????
-	 * @param uid
-	 * @return
-	 */
-	List<OrganizationContactBook> findCustomerContacts(@Param("uid")String uid,@Param("aid")String aid);
-
-	/**
-	 * 查询客户�????有联系人
-	 * @param uid
-	 * @return
-	 */
 	List<OrganizationContactBook> findAllContacts(String uid);
 
-	/**
-	 * 查询用户
-	 * @param id
-	 * @param identifyName 认证用户
-	 * @param mobile 手机号码
-	 * @param type 用户类型 0-个人 1-单位
-	 * @param source 来源 0-注册 1-录入
-	 * @return 
-	 * @param nickname 昵称
-	 */
-	List<User> checkUser(@Param("id")String id,@Param("identifyName")String identifyName, @Param("mobile")String mobile,
-			@Param("type")Integer type,@Param("source") Integer source,@Param("nickname") String nickname);
-
-	/**
-	 * 查询用户基本信息
-	 * @param id
-	 * @return
-	 */
 	UserBasicInfo selectBaseInfo(@Param("id")String id);
 
-	/**
-	 * 根据用户编号
-	 * @param easemobName
-	 * @return
-	 */
 	User selectByNumber(@Param("easemobName")String easemobName);
 	
 	List<Admin> findAdminName(String aid);
-	
-	int updateEnteringAudit(@Param("id")String id,@Param("auditStatus")Integer auditStatus,@Param("auditOpinion")String auditOpinion);
-
-	int updateRefusedCustomer(@Param("id")String id,  @Param("nickname")String nickname, @Param("mobile")String mobile, @Param("societyTag")String societyTag);
 
 	List<User> selectUserByRoleName(@Param("roleName")String roleName);
 

+ 19 - 8
src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml

@@ -410,14 +410,20 @@
   </update>
   
   <select id="checkContacts" resultType="java.lang.Integer">
-		select
-			count( 0 )
-		from
-			organization_contact_book
-		where
-			aid = #{aid,jdbcType=VARCHAR}
-			and uid = #{uid,jdbcType=VARCHAR}
-			and mobile = #{mobile,jdbcType=VARCHAR}
+	select
+	count( 0 )
+	from
+	organization_contact_book
+	where 1=1
+	<if test="uid != null">
+		and uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="aid != null">
+		and aid = #{aid,jdbcType=VARCHAR}
+	</if>
+	<if test="mobile != null">
+		and mobile = #{mobile,jdbcType=VARCHAR}
+	</if>
   </select>
   
   <update id="updateSubContact">
@@ -426,4 +432,9 @@
   <update id="updateMainContact">
   	 update organization_contact_book set major = 1 where id = #{ocbId,jdbcType=VARCHAR}
   </update>
+  
+  <select id="selectContactByUid" resultType="com.goafanti.user.bo.UserContactBo">
+  	select id,name,mobile,email,qq,wechat,depatrment,position,major from organization_contact_book
+	where uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 32 - 11
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1210,18 +1210,39 @@
 		where uid = #{uid,jdbcType=VARCHAR}
 	</select>
 
-
 	<select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgIdentityBo">
-		select 
-		t.id,t.uid,t.contacts,t.fixed_tel as fixedTel,
-		t.qq,t.postal_address
-		as postalAddress ,t.postcode,
-		u.email ,t.legal_person
-		as legalPerson
-		from user u LEFT JOIN organization_identity t
-		on t.uid =
-		u.id
-		where t.uid=#{uid,jdbcType=VARCHAR}
+		select
+			a.id as uid,
+			a.identify_name as identifyName,
+			a.mobile,
+			a.email,
+			a.introduction,
+			a.company_logo_url as companyLogoUrl,
+			a.society_tag as societyTag,
+			a.authentication,
+			b.id,
+			b.industry,
+			b.enterprise_scale as enterpriseScale,
+			b.registered_capital as registeredCapital,
+			b.legal_person as legalPerson,
+			b.legal_person_tel as legalPersonTel,
+			b.legal_person_id_card as legalPersonIdCard,
+			b.legal_person_email as legalPersonEmail,
+			b.listed,
+			b.high_tech_zone as highTechZone,
+			b.licence_province as licenceProvince,
+			b.licence_city as licenceCity,
+			b.licence_area as licenceArea,
+			b.postal_address as postalAddress,
+			b.fixed_tel as fixedTel,
+			b.org_code_url as orgCodeUrl,
+			b.org_code as orgCode,
+			b.business_scope as businessScope
+		from
+			user a left join organization_identity b on
+			a.id = b.uid
+		where
+			a.id = #{uid,jdbcType=VARCHAR}
 	</select>
 
 	<select id="selectAllOrgIndentity" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgUnitNames">

+ 28 - 7
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -823,13 +823,34 @@
   </select>
    
   <select id="selectUserIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserIdentityBo">
-  	select 
-  		   t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
-  		   t.date_of_birth_month as dateOfBirthMonth, t.id_number as idNumber, t.audit_status as auditStatus,
-		   u.mobile, u.number 
-		   from user u left JOIN user_identity t
-	on t.uid = u.id 
-	where t.uid=#{uid,jdbcType=VARCHAR}
+	 select
+	 	a.id as uid,
+		a.identify_name as identifyName,
+		a.mobile,
+		a.email,
+		a.introduction,
+		a.head_portrait_url as headPortraitUrl,
+		a.society_tag as societyTag,
+		a.authentication,
+		b.id,
+		b.industry,
+		b.sex,
+		b.date_of_birth_year as dateOfBirthYear,
+		b.date_of_birth_month as dateOfBirthMonth,
+		b.id_number as idNumber,
+		b.positive_id_url as positiveIdUrl,
+		b.opposite_id_url as oppositeIdUrl,
+		b.province,
+		b.city,
+		b.area,
+		b.postal_address as postalAddress,
+		b.fixed_tel as fixedTel,
+		b.qq
+	from
+		user a left join user_identity b on
+		a.id = b.uid
+	where
+		a.id = #{uid,jdbcType=VARCHAR}
   </select>
   
   <select id="selectAuditorUserIdentityByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorUserIdentityDetailBo">

+ 23 - 406
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -652,12 +652,17 @@
     <result column="uid" jdbcType="VARCHAR" property="uid" />
     <result column="lvl" jdbcType="INTEGER" property="lvl" />
     <result column="nickname" jdbcType="VARCHAR" property="nickname" />
+    <result column="username" jdbcType="VARCHAR" property="username"/>
+    <result column="identify_name" jdbcType="VARCHAR" property="identifyName"/>
     <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
     <result column="number" jdbcType="INTEGER" property="number" />
     <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="person_portrait_url" jdbcType="VARCHAR" property="personPortraitUrl" />
+    <result column="status" jdbcType="INTEGER" property="status"/>
+    <result column="authentication" jdbcType="INTEGER" property="authentication"/>
+    <result column="head_portrait_url" jdbcType="VARCHAR" property="headPortraitUrl" />
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl" />
-    <result column="grade_name" jdbcType="VARCHAR" property="gradeName" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
   </resultMap>
   
   <resultMap id="UserDownLoadBo" type="com.goafanti.user.bo.UserDownLoadBo">
@@ -691,15 +696,19 @@
   </select>
   
   <select id="selectUserPageHomeBoByUserId" parameterType="java.lang.String" resultMap="UserPageHomeBo">
-   select 
-   		u.lvl,mg.grade_name , u.nickname, u.email,
-   		u.number, u.type, u.head_portrait_url as person_portrait_url, 
-   		u.company_logo_url as logo_url, u.id as uid, adc.achievement_count as achievementNum,
-   		adc.demand_count as demandNum
-   from user u 
-   LEFT JOIN achievement_demand_count adc on adc.uid = u.id
-   LEFT JOIN  member_grade mg ON mg.member_rank=u.lvl
-   where u.id = #{uid,jdbcType = VARCHAR}
+  	select 
+  		id,
+  		number,
+  		username,
+  		identify_name,
+  		nickname,
+  		create_time,
+  		authentication,
+  		status,email,
+  		head_portrait_url,
+  		mobile from user
+   	where 
+   		id = #{uid,jdbcType = VARCHAR}
   </select>
   
   <select id="selectUserDownLoadBoByUserId" parameterType="java.lang.String" resultMap="UserDownLoadBo">
@@ -1015,9 +1024,7 @@
     	and u.create_time <![CDATA[ < ]]> #{endCreateTime,jdbcType=TIMESTAMP}
     </if>
   </select>
-  
-  
-  
+
   <select id="findUserByNameAndMobile" resultType="java.lang.String">
   	select 
   		ui.username
@@ -1045,398 +1052,8 @@
   		and u.mobile = #{mobile,jdbcType=VARCHAR}
   	</if>
   </select>
-  
-   <select id="findAreaManagerUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
-  	select 
-  		u.id ,
-  		u.mobile, 
-  		u.email, 
-  		u.create_time as createTime, 
-  	    u.number , 
-  	    i.audit_status as auditStatus, 
-  	    i.username,
-  	    a.name as adminName,
-  	    ad.name as managerName
-    from user u  
-    LEFT JOIN admin a on a.id = u.aid
-    LEFT JOIN admin ad on ad.id = u.mid
-    LEFT JOIN user_identity i on u.id = i.uid  
-    where u.type = 0
-    <if test="mobile != null">
-        and u.mobile = #{mobile,jdbcType=VARCHAR}
-    </if>
-    <if test="email != null">
-        and u.email = #{email,jdbcType=VARCHAR}
-    </if>
-    <if test="pStart != null">
-        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-    </if>
-    <if test="pEnd != null">
-        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-    </if>
-    <if test=" number != null">
-        and u.number = #{number,jdbcType=INTEGER}
-    </if>
-    <if test="username != null">
-        and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
-    </if>
-    <if test="auditStatus != null">
-        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-    </if>
-    
-     <if test="provinceList != null">
-       and  i.province in
-        <foreach close=")" collection="provinceList" item="plist" open="(" separator=",">
-            #{plist}
-        </foreach>
-    </if>
-    <if test="cityList != null">
-        and i.city in 
-        <foreach close=")" collection="cityList" item="clist" open="(" separator=",">
-            #{clist}
-        </foreach>
-    </if>
-    
-    order by u.number desc
-    <if test="page_sql!=null">
-        ${page_sql}
-    </if>
-  </select>
-  
-  <select id="findAreaManagerUserCount" parameterType="String" resultType="java.lang.Integer">
-  	select count(1) 
-    from user u LEFT JOIN user_identity i 
-    ON u.id = i.uid 
-    WHERE u.type = 0
-    <if test="mobile != null">
-        and u.mobile = #{mobile,jdbcType=VARCHAR}
-    </if>
-    <if test="email != null">
-        and u.email = #{email,jdbcType=VARCHAR}
-    </if>
-    <if test="pStart != null">
-        and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-    </if>
-    <if test="pEnd != null">
-        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-    </if>
-    <if test="number != null">
-        and u.number = #{number,jdbcType=INTEGER}
-    </if>
-    <if test="username != null">
-        and i.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')   
-    </if>
-    <if test="auditStatus != null">
-        and i.audit_status= #{auditStatus,jdbcType=INTEGER}
-    </if>
-    
-     <if test="provinceList != null">
-       and  i.province in
-        <foreach close=")" collection="provinceList" item="plist" open="(" separator=",">
-            #{plist}
-        </foreach>
-    </if>
-    <if test="cityList != null">
-        and i.city in 
-        <foreach close=")" collection="cityList" item="clist" open="(" separator=",">
-            #{clist}
-        </foreach>
-    </if>
-  </select>  
-  
-   <select id="findAreaManagerOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
-  	select 
-  		u.id ,
-  		u.mobile, 
-  		u.email, 
-  		u.create_time as createTime, 
-  	    u.number , 
-  	    o.audit_status as orgAuditStatus, 
-  	    a.name as adminName,
-  	    o.unit_name as unitName, 
-  	    ad.name as managerName
-    from user u  
-    LEFT JOIN admin a on a.id = u.aid 
-    LEFT JOIN admin ad on ad.id = u.mid
-    LEFT JOIN organization_identity o on u.id = o.uid 
-    WHERE u.type = 1
-    <if test="mobile != null">
-        and u.mobile = #{mobile,jdbcType=VARCHAR}
-    </if>
-    <if test="uid != null">
-        and u.id = #{uid,jdbcType=VARCHAR}
-    </if>
-    <if test="email != null">
-        and u.email = #{email,jdbcType=VARCHAR}
-    </if>
-    <if test="pStart != null">
-        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-    </if>
-    <if test="pEnd != null">
-        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-    </if>
-    <if test=" number != null">
-        and u.number = #{number,jdbcType=INTEGER}
-    </if>
-    <if test="unitName != null">
-        and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
-    </if>
-    <if test="auditStatus != null">
-        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-    </if>
-     <if test="provinceList != null">
-       and  o.licence_province in
-        <foreach close=")" collection="provinceList" item="plist" open="(" separator=",">
-            #{plist}
-        </foreach>
-    </if>
-    <if test="cityList != null">
-        and o.licence_city in 
-        <foreach close=")" collection="cityList" item="clist" open="(" separator=",">
-            #{clist}
-        </foreach>
-    </if>
-    order by u.number desc
-    <if test="page_sql!=null">
-        ${page_sql}
-    </if>
-  </select>
-  
-  <select id="findAreaManagerOrgCount" parameterType="String" resultType="java.lang.Integer">
-  	select count(1) 
-    from user u LEFT JOIN organization_identity o 
-    ON u.id = o.uid 
-    WHERE u.type = 1
-    <if test="uid != null">
-        and u.id = #{uid,jdbcType=VARCHAR}
-    </if>
-    <if test="mobile != null">
-        and u.mobile = #{mobile,jdbcType=VARCHAR}
-    </if>
-    <if test="email != null">
-        and u.email = #{email,jdbcType=VARCHAR}
-    </if>
-    <if test="pStart != null">
-        and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
-    </if>
-    <if test="pEnd != null">
-        and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-    </if>
-    <if test=" number != null">
-        and u.number = #{number,jdbcType=INTEGER}
-    </if>
-    <if test="unitName != null">
-        and o.unit_name like '%'#{unitName,jdbcType=VARCHAR}'%'
-    </if>
-    <if test="auditStatus != null">
-        and o.audit_status= #{auditStatus,jdbcType=INTEGER}
-    </if>
-     <if test="provinceList != null">
-       and  i.province in
-        <foreach close=")" collection="provinceList" item="plist" open="(" separator=",">
-            #{plist}
-        </foreach>
-    </if>
-    <if test="cityList != null">
-        and i.city in 
-        <foreach close=")" collection="cityList" item="clist" open="(" separator=",">
-            #{clist}
-        </foreach>
-    </if>
-  </select>  
-  
- 	<select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
-		select
-		u.id,i.username,i.work_unit as workUnit,i.professional_title as position,u.introduction as achievement,
-		u.head_portrait_url as personPortraitUrl,
-		i.province,
-		u.introduction as personalProfile,
-		ua.ability_label as abilityLabel,i.qualification,
-		i.graduate_school,i.major_category,i.work_unit as workUnit,
-		ic.name as engagedField
-		from `user` u
-		left join user_identity i on u.id=i.uid
-		left join
-		user_career c on u.id=c.uid
-		<!-- left join user_info info on u.id=info.uid -->
-		left join user_ability ua on u.id=ua.uid
-		left join user_edu e on u.id=e.uid
-		left join industry_category ic on i.industry=ic.id
-		WHERE
-		u.type = 0
-		<if test="_parameter!= null">
-			and u.id= #{_parameter,jdbcType=VARCHAR}
-		</if>
-	</select>
-  
-  <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
-		select
-		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
-		u.head_portrait_url as personPortraitUrl,
-		i.province,u.introduction as personalProfile,
-		ua.ability_label as abilityLabel
-		from `user` u
-		left join user_identity i on u.id=i.uid
-		left join
-		user_career c on u.id=c.uid
-		<!-- left join user_info info on u.id=info.uid -->
-		left join user_ability ua on u.id=ua.uid
-		WHERE
-		u.type = 1
-		<if test="_parameter!= null">
-			and u.id= #{_parameter,jdbcType=VARCHAR}
-		</if>
-	</select>
-  
-  <select id="findStarListByPage" parameterType="String" resultType="com.goafanti.user.bo.StarListBo">
-  	select 
-  		u.id as uid,
-  		u.number,
-  		ui.username,
-  		uc.engaged_field as engagedField,
-  		uc.professional_title as professionalTitle,
-  		uc.work_unit as workUnit,
-  		adc.achievement_count as achievementNum
-  	from user u
-  	left join user_identity ui on ui.uid = u.id
-  	left join user_career uc on uc.uid = u.id
-  	left join achievement_demand_count adc on adc.uid = u.id
-  	where 
-  		ui.celebrity = 1
-  	<if test="number != null">
-  		and u.number = #{number,jdbcType=INTEGER}
-  	</if>
-  	<if test="engagedField != null">
-  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="username != null">
-  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="professionalTitle != null">
-  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="workUnit != null">
-  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
-  	</if>
-  	ORDER BY adc.achievement_count DESC
-    <if test="page_sql!=null">
-        ${page_sql}
-    </if>
-  	
-  </select>
-  
-  <select id="findStarCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from user u
-  	left join user_identity ui on ui.uid = u.id
-  	left join user_career uc on uc.uid = u.id
-  	where 
-  		ui.celebrity = 1
-  	<if test="number != null">
-  		and u.number = #{number,jdbcType=INTEGER}
-  	</if>
-  	<if test="engagedField != null">
-  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="username != null">
-  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="professionalTitle != null">
-  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="workUnit != null">
-  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
-  	</if>
-  </select>
-  
-  <select id="findStarAndExpertListByPage" parameterType="String" resultType="com.goafanti.user.bo.StarAndExpertListBo">
-  	select 
-  		u.id as uid,
-  		u.number,
-  		ui.username,
-  		uc.engaged_field as engagedField,
-  		uc.professional_title as professionalTitle,
-  		uc.work_unit as workUnit,
-  		adc.achievement_count as achievementNum
-  	from user u
-  	left join user_identity ui on ui.uid = u.id
-  	left join user_career uc on uc.uid = u.id
-  	left join achievement_demand_count adc on adc.uid = u.id
-  	where 
-  		(ui.celebrity = 1 or ui.expert = 1)
-  	<if test="number != null">
-  		and u.number = #{number,jdbcType=INTEGER}
-  	</if>
-  	<if test="engagedField != null">
-  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="username != null">
-  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="professionalTitle != null">
-  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="workUnit != null">
-  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
-  	</if>
-  	ORDER BY adc.achievement_count DESC
-    <if test="page_sql!=null">
-        ${page_sql}
-    </if>
-  	
-  </select>
-  
-  <select id="findStarAndExpertCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from user u
-  	left join user_identity ui on ui.uid = u.id
-  	left join user_career uc on uc.uid = u.id
-  	where 
-  		(ui.celebrity = 1 or ui.expert = 1)
-  	<if test="number != null">
-  		and u.number = #{number,jdbcType=INTEGER}
-  	</if>
-  	<if test="engagedField != null">
-  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="username != null">
-  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="professionalTitle != null">
-  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="workUnit != null">
-  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
-  	</if>
-  </select>
-  
-  <select id="selectNumberByPrimaryKey" parameterType="String" resultType="java.lang.Long">
-  	select number
-  	from user
-  	where id = #{id,jdbcType=VARCHAR}
-  </select>
-  
-  <select id="findUserPartner" parameterType="String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
-		select
-		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
-		u.head_portrait_url as personPortraitUrl,
-		i.province,
-		u.introduction as personalProfile,
-		ua.ability_label as abilityLabel,i.uid,u.type
-		from `user` u
-		left join user_identity i on u.id=i.uid
-		left join
-		user_career c on u.id=c.uid
-		<!-- left join user_info info on u.id=info.uid -->
-		left join user_ability ua on u.id=ua.uid
-		WHERE
-		u.type = 0
-		limit 0,50
-	</select>
-	
-	<select id="checkUser" resultMap="BaseResultMap">
+
+ 	<select id="checkUser" resultMap="BaseResultMap">
 		select
 			id
 		from

+ 0 - 63
src/main/java/com/goafanti/portal/controller/PortalFinancialController.java

@@ -1,63 +0,0 @@
-package com.goafanti.portal.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.controller.BaseController;
-import com.goafanti.user.bo.OrgPartnerDetailBo;
-
-/**
- * 
- * @author Administrator
- *	科技金融
- */
-@Controller
-public class PortalFinancialController extends BaseController{
-
-	/**
-	 * 金融机构查询 
-	 * @return
-	 */
-	@RequestMapping(value = "/portal/financial/search", method = RequestMethod.GET)
-	@ResponseBody
-	public Result financialSearch(Integer provinceId,String keyword,Integer pageSize,Integer pageNo){
-		pageSize = pageSize == null ? 10 : pageSize;
-		pageNo = pageNo == null ? 10 : pageNo;
-		Result result = new Result();
-		
-		return result;
-	}
-	
-	/**
-	 * 金融机构详情
-	 * @param organizationId
-	 * @return
-	 */
-	@RequestMapping(value = "/portal/financial/investmentDetail", method = RequestMethod.GET)
-	public ModelAndView investmentDetail(String organizationId){
-		ModelAndView mv = new ModelAndView();
-		OrgPartnerDetailBo bo=new OrgPartnerDetailBo();
-		mv.setViewName("/portal/financial/investmentDetail");
-		List<OrgPartnerDetailBo> list = new ArrayList<OrgPartnerDetailBo>();
-		mv.addObject("bo",bo);
-		mv.addObject("recommendCompanyList",list);
-		return mv;
-	}
-	@RequestMapping(value = "/portal/financial/investmentInstitution", method = RequestMethod.GET)
-	public ModelAndView investmentInstitution(String organizationId){
-		ModelAndView mv = new ModelAndView();
-		OrgPartnerDetailBo bo=new OrgPartnerDetailBo();
-		mv.setViewName("/portal/financial/investmentInstitution");
-		List<OrgPartnerDetailBo> list = new ArrayList<OrgPartnerDetailBo>();
-		mv.addObject("bo",bo);
-		mv.addObject("recommendCompanyList",list);
-		return mv;
-	}
-}

+ 110 - 10
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -34,8 +34,8 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		postcode;
 
-	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		unitName;
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		identifyName;
 
 	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -99,10 +99,16 @@ public class InputOrganizationIdentity {
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		legalPerson;
-
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String 		legalPersonTel;
+	
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		legalPersonIdCard;
 
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String 		legalPersonEmail;
+	
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		lastYearTaxReportUrl;
 
@@ -149,12 +155,34 @@ public class InputOrganizationIdentity {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		level;
 
-	/**
-	 * 领域
-	 */
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer industry;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer enterpriseScale;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer highTechZone;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer authentication;
+	
+	@Size(min = 0, max = 400, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String businessScope;
+	
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		field;
 
+	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
+	private String email;
+	
+	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
+	private String companyLogoUrl;
+	
 	public String getId() {
 		return id;
 	}
@@ -219,12 +247,12 @@ public class InputOrganizationIdentity {
 		this.postcode = postcode;
 	}
 
-	public String getUnitName() {
-		return unitName;
+	public String getIdentifyName() {
+		return identifyName;
 	}
 
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
 	}
 
 	public Integer getRegisteredCapital() {
@@ -359,6 +387,14 @@ public class InputOrganizationIdentity {
 		this.legalPerson = legalPerson;
 	}
 
+	public String getLegalPersonTel() {
+		return legalPersonTel;
+	}
+
+	public void setLegalPersonTel(String legalPersonTel) {
+		this.legalPersonTel = legalPersonTel;
+	}
+
 	public String getLegalPersonIdCard() {
 		return legalPersonIdCard;
 	}
@@ -367,6 +403,14 @@ public class InputOrganizationIdentity {
 		this.legalPersonIdCard = legalPersonIdCard;
 	}
 
+	public String getLegalPersonEmail() {
+		return legalPersonEmail;
+	}
+
+	public void setLegalPersonEmail(String legalPersonEmail) {
+		this.legalPersonEmail = legalPersonEmail;
+	}
+
 	public String getLastYearTaxReportUrl() {
 		return lastYearTaxReportUrl;
 	}
@@ -491,6 +535,46 @@ public class InputOrganizationIdentity {
 		return locationArea;
 	}
 
+	public Integer getIndustry() {
+		return industry;
+	}
+
+	public void setIndustry(Integer industry) {
+		this.industry = industry;
+	}
+
+	public Integer getEnterpriseScale() {
+		return enterpriseScale;
+	}
+
+	public void setEnterpriseScale(Integer enterpriseScale) {
+		this.enterpriseScale = enterpriseScale;
+	}
+
+	public Integer getHighTechZone() {
+		return highTechZone;
+	}
+
+	public void setHighTechZone(Integer highTechZone) {
+		this.highTechZone = highTechZone;
+	}
+
+	public Integer getAuthentication() {
+		return authentication;
+	}
+
+	public void setAuthentication(Integer authentication) {
+		this.authentication = authentication;
+	}
+
+	public String getBusinessScope() {
+		return businessScope;
+	}
+
+	public void setBusinessScope(String businessScope) {
+		this.businessScope = businessScope;
+	}
+
 	public String getField() {
 		return field;
 	}
@@ -499,4 +583,20 @@ public class InputOrganizationIdentity {
 		this.field = field;
 	}
 
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getCompanyLogoUrl() {
+		return companyLogoUrl;
+	}
+
+	public void setCompanyLogoUrl(String companyLogoUrl) {
+		this.companyLogoUrl = companyLogoUrl;
+	}
+
 }

+ 114 - 48
src/main/java/com/goafanti/user/bo/InputUserIdentity.java

@@ -1,6 +1,5 @@
 package com.goafanti.user.bo;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import javax.validation.constraints.Max;
@@ -51,20 +50,7 @@ public class InputUserIdentity {
 	private Integer		area;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		contactMobile;
-
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		bankName;
-
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		bankAccount;
-
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		bankCardNumber;
-
-	@Max(value = (long) 99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private BigDecimal	amountMoney;
+	private String		mobile;
 
 	@Max(value = 5, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -91,7 +77,40 @@ public class InputUserIdentity {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		celebrity;
-
+	
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String identifyName;
+	
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String email;
+	
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String introduction;
+	
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String headPortraitUrl;
+	
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer societyTag;
+	
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer industry;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String postalAddress;
+	
+	@Size(min = 0, max = 13, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String fixedTel;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String qq;
+	
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer authentication;
+	
 	public Integer getExpert() {
 		return expert;
 	}
@@ -219,69 +238,116 @@ public class InputUserIdentity {
 	public void setArea(Integer area) {
 		this.area = area;
 	}
+	
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
 
-	public String getContactMobile() {
-		return contactMobile;
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
 	}
 
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
+	public Integer getProcess() {
+		return process;
 	}
 
-	public String getBankName() {
-		return bankName;
+	public void setProcess(Integer process) {
+		this.process = process;
 	}
 
-	public void setBankName(String bankName) {
-		this.bankName = bankName;
+	public Integer getWrongCount() {
+		return wrongCount;
 	}
 
-	public String getBankAccount() {
-		return bankAccount;
+	public void setWrongCount(Integer wrongCount) {
+		this.wrongCount = wrongCount;
 	}
 
-	public void setBankAccount(String bankAccount) {
-		this.bankAccount = bankAccount;
+	public String getMobile() {
+		return mobile;
 	}
 
-	public String getBankCardNumber() {
-		return bankCardNumber;
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
 	}
 
-	public void setBankCardNumber(String bankCardNumber) {
-		this.bankCardNumber = bankCardNumber;
+	public String getIdentifyName() {
+		return identifyName;
 	}
 
-	public BigDecimal getAmountMoney() {
-		return amountMoney;
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
 	}
 
-	public void setAmountMoney(BigDecimal amountMoney) {
-		this.amountMoney = amountMoney;
+	public String getEmail() {
+		return email;
 	}
 
-	public Integer getAuditStatus() {
-		return auditStatus;
+	public void setEmail(String email) {
+		this.email = email;
 	}
 
-	public void setAuditStatus(Integer auditStatus) {
-		this.auditStatus = auditStatus;
+	public String getIntroduction() {
+		return introduction;
 	}
 
-	public Integer getProcess() {
-		return process;
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
 	}
 
-	public void setProcess(Integer process) {
-		this.process = process;
+	public String getHeadPortraitUrl() {
+		return headPortraitUrl;
 	}
 
-	public Integer getWrongCount() {
-		return wrongCount;
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
 	}
 
-	public void setWrongCount(Integer wrongCount) {
-		this.wrongCount = wrongCount;
+	public Integer getSocietyTag() {
+		return societyTag;
+	}
+
+	public void setSocietyTag(Integer societyTag) {
+		this.societyTag = societyTag;
+	}
+
+	public Integer getIndustry() {
+		return industry;
+	}
+
+	public void setIndustry(Integer industry) {
+		this.industry = industry;
 	}
 
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
+	public String getFixedTel() {
+		return fixedTel;
+	}
+
+	public void setFixedTel(String fixedTel) {
+		this.fixedTel = fixedTel;
+	}
+
+	public String getQq() {
+		return qq;
+	}
+
+	public void setQq(String qq) {
+		this.qq = qq;
+	}
+
+	public Integer getAuthentication() {
+		return authentication;
+	}
+
+	public void setAuthentication(Integer authentication) {
+		this.authentication = authentication;
+	}
 }

+ 0 - 14
src/main/java/com/goafanti/user/bo/OrgIdentityBo.java

@@ -1,19 +1,5 @@
 package com.goafanti.user.bo;
 
-import javax.validation.constraints.Size;
-
-import com.goafanti.common.constant.ErrorConstants;
-
 public class OrgIdentityBo extends InputOrganizationIdentity {
-	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
-	private String email;
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
 
 }

+ 0 - 186
src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java

@@ -1,186 +0,0 @@
-package com.goafanti.user.bo;
-
-public class OrgPartnerDetailBo {
-	private String	unitName;
-
-	private Integer	province;
-
-	private Integer	city;
-
-	private Integer	area;
-
-	private Long	number;
-
-	private Integer	level;
-
-	private String	abilityLabel;
-
-	private String	logoUrl;
-
-	private String	publicityPictureUrl;
-
-	private String	field;
-
-	private String	companyIntroduction;
-
-	private String	interestId;
-	
-	/**用户名**/
-	private String userName;
-	/**工作单位**/
-	private String workUnit;
-	/**职位**/
-	private String position;
-	/**成就**/
-	private String achievement;
-	/**个人头像**/
-	private String personPortraitUrl;
-	/**个人介绍**/
-	private String personalProfile;
-
-	public String getInterestId() {
-		return interestId;
-	}
-
-	public void setInterestId(String interestId) {
-		this.interestId = interestId;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
-
-	public Integer getProvince() {
-		return province;
-	}
-
-	public void setProvince(Integer province) {
-		this.province = province;
-	}
-
-	public Integer getCity() {
-		return city;
-	}
-
-	public void setCity(Integer city) {
-		this.city = city;
-	}
-
-	public Integer getArea() {
-		return area;
-	}
-
-	public void setArea(Integer area) {
-		this.area = area;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	public String getAbilityLabel() {
-		return abilityLabel;
-	}
-
-	public void setAbilityLabel(String abilityLabel) {
-		this.abilityLabel = abilityLabel;
-	}
-
-	public String getLogoUrl() {
-		return logoUrl;
-	}
-
-	public void setLogoUrl(String logoUrl) {
-		this.logoUrl = logoUrl;
-	}
-
-	public String getPublicityPictureUrl() {
-		return publicityPictureUrl;
-	}
-
-	public void setPublicityPictureUrl(String publicityPictureUrl) {
-		this.publicityPictureUrl = publicityPictureUrl;
-	}
-
-	public String getField() {
-		return field;
-	}
-
-	public void setField(String field) {
-		this.field = field;
-	}
-
-	public String getCompanyIntroduction() {
-		return companyIntroduction;
-	}
-
-	public void setCompanyIntroduction(String companyIntroduction) {
-		this.companyIntroduction = companyIntroduction;
-	}
-
-	public Long getNumber() {
-		return number;
-	}
-
-	public void setNumber(Long number) {
-		this.number = number;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getWorkUnit() {
-		return workUnit;
-	}
-
-	public void setWorkUnit(String workUnit) {
-		this.workUnit = workUnit;
-	}
-
-	public String getPosition() {
-		return position;
-	}
-
-	public void setPosition(String position) {
-		this.position = position;
-	}
-
-	public String getAchievement() {
-		return achievement;
-	}
-
-	public void setAchievement(String achievement) {
-		this.achievement = achievement;
-	}
-
-	public String getPersonPortraitUrl() {
-		return personPortraitUrl;
-	}
-
-	public void setPersonPortraitUrl(String personPortraitUrl) {
-		this.personPortraitUrl = personPortraitUrl;
-	}
-
-	public String getPersonalProfile() {
-		return personalProfile;
-	}
-
-	public void setPersonalProfile(String personalProfile) {
-		this.personalProfile = personalProfile;
-	}
-
-	
-}

+ 0 - 5
src/main/java/com/goafanti/user/bo/StarAndExpertListBo.java

@@ -1,5 +0,0 @@
-package com.goafanti.user.bo;
-
-public class StarAndExpertListBo extends StarListBo {
-
-}

+ 0 - 88
src/main/java/com/goafanti/user/bo/StarListBo.java

@@ -1,88 +0,0 @@
-package com.goafanti.user.bo;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public class StarListBo {
-	private String	uid;
-
-	private String	engagedField;
-
-	private String	username;
-
-	private String	professionalTitle;
-
-	private String	workUnit;
-
-	private Integer	number;
-
-	private Integer	achievementNum;
-
-	public String getUid() {
-		return uid;
-	}
-
-	public void setUid(String uid) {
-		this.uid = uid;
-	}
-
-	public String getEngagedField() {
-		return engagedField;
-	}
-
-	public void setEngagedField(String engagedField) {
-		this.engagedField = engagedField;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getProfessionalTitle() {
-		return professionalTitle;
-	}
-
-	public void setProfessionalTitle(String professionalTitle) {
-		this.professionalTitle = professionalTitle;
-	}
-
-	public String getWorkUnit() {
-		return workUnit;
-	}
-
-	public void setWorkUnit(String workUnit) {
-		this.workUnit = workUnit;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	public Integer getAchievementNum() {
-		return achievementNum;
-	}
-
-	public void setAchievementNum(Integer achievementNum) {
-		this.achievementNum = achievementNum;
-	}
-
-	public Integer getAchievementNums() {
-		if (null == this.achievementNum) {
-			return 0;
-		} else {
-			return this.achievementNum;
-		}
-	}
-
-	public void setAchievementNums(Integer achievementNum) {
-	}
-
-}

+ 12 - 0
src/main/java/com/goafanti/user/bo/UserContactBo.java

@@ -0,0 +1,12 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.OrganizationContactBook;
+
+/**
+ * 通讯录
+ * @author Administrator
+ *
+ */
+public class UserContactBo extends  OrganizationContactBook{
+
+}

+ 1 - 145
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -1,149 +1,5 @@
 package com.goafanti.user.bo;
 
-import com.goafanti.common.model.UserIdentity;
-
-public class UserIdentityBo extends UserIdentity {
-	private Long	number;
-	private String	mobile;
-	private String  workUnit;
-	private String  professionalTitle;
-	private String introduction;
-	private String headPortraitUrl;
-	private String province0;
-	private String city0;
-	private String area0;
-	private String industry0;
-	private String countInterest;
-	private String interest;
-	private String reservationCount;
-	private String easemobName;
-	public String getProvince0() {
-		return province0;
-	}
-
-	public void setProvince0(String province0) {
-		this.province0 = province0;
-	}
-
-	public String getCity0() {
-		return city0;
-	}
-
-	public void setCity0(String city0) {
-		this.city0 = city0;
-	}
-
-	public String getArea0() {
-		return area0;
-	}
-
-	public void setArea0(String area0) {
-		this.area0 = area0;
-	}
-
-	public String getIndustry0() {
-		return industry0;
-	}
-
-	public void setIndustry0(String industry0) {
-		this.industry0 = industry0;
-	}
-
-	public String getWorkUnit() {
-		return workUnit;
-	}
-
-	public void setWorkUnit(String workUnit) {
-		this.workUnit = workUnit;
-	}
-
-	public String getProfessionalTitle() {
-		return professionalTitle;
-	}
-
-	public void setProfessionalTitle(String professionalTitle) {
-		this.professionalTitle = professionalTitle;
-	}
-
-	
-
-	
-	public String getIntroduction() {
-		return introduction;
-	}
-
-	public void setIntroduction(String introduction) {
-		this.introduction = introduction;
-	}
-
-	public Long getNumber() {
-		return number;
-	}
-
-	public void setNumber(Long number) {
-		this.number = number;
-	}
-
-	public String getMobile() {
-		return mobile;
-	}
-
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-
-	public String getHeadPortraitUrl() {
-		return headPortraitUrl;
-	}
-
-	public void setHeadPortraitUrl(String headPortraitUrl) {
-		this.headPortraitUrl = headPortraitUrl;
-	}
-
-	public String getCountInterest() {
-		if(countInterest!=null){
-			return String.valueOf(Integer.valueOf(countInterest)+20);
-		}
-		return "20";
-	}
-
-	public void setCountInterest(String countInterest) {
-		this.countInterest = countInterest;
-	}
-
-	@Override
-	public String toString() {
-		return "UserIdentityBo [number=" + number + ", mobile=" + mobile + ", workUnit=" + workUnit
-				+ ", professionalTitle=" + professionalTitle + ", introduction=" + introduction + ", headPortraitUrl="
-				+ headPortraitUrl + ", province0=" + province0 + ", city0=" + city0 + ", area0=" + area0
-				+ ", industry0=" + industry0 + ", countInterest=" + countInterest + "]";
-	}
-
-	public String getInterest() {
-		return interest;
-	}
-
-	public void setInterest(String interest) {
-		this.interest = interest;
-	}
-
-	public String getReservationCount() {
-		return reservationCount;
-	}
-
-	public void setReservationCount(String reservationCount) {
-		this.reservationCount = reservationCount;
-	}
-
-	public String getEasemobName() {
-		return easemobName;
-	}
-
-	public void setEasemobName(String easemobName) {
-		this.easemobName = easemobName;
-	}
-
-	
-	
+public class UserIdentityBo extends InputUserIdentity {
 
 }

+ 71 - 71
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -1,4 +1,9 @@
 package com.goafanti.user.bo;
+
+import java.util.Date;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
 public class UserPageHomeBo {
     private String	uid;
     /**
@@ -6,9 +11,17 @@ public class UserPageHomeBo {
      */
     private Integer	lvl;
     /**
+     * 注册用户名
+     */
+    private String username;
+    /**
      * 用户昵称
      */
     private String	nickname;
+   /**
+    * 用户认证名称
+    */
+    private String identifyName;
     /**
      * 邮箱
      */
@@ -24,45 +37,31 @@ public class UserPageHomeBo {
     /**
      * 用户头像URL
      */
-    private String	personPortraitUrl;
+    private String	headPortraitUrl;
     /**
      * 公司LogoUrl
      */
     private String	logoUrl;
+   
     /**
-     * 专利数量
-     */
-    private Integer	patentNum;
-    /**
-     * 软著数量
+     * 用户状态
      */
-    private Integer	copyrightNum;
-    /**
-     * 科技成果数量
-     */
-    private Integer	techProjectNum;
+    private Integer status;
+    
     /**
-     * 发布需求数量
+     * 实名认证
      */
-    private Integer	demandNum;
+    private Integer authentication;
+    
     /**
-     * 发布成果数量
+     * 注册时间
      */
-    private Integer	achievementNum;
+    private Date createTime;
+    
     /**
-     * 知识产权数量
+     * 手机号码 
      */
-    private Integer	intellectualPropertyNum;
-    //会员名称
-    private String gradeName;
-    
-    public String getGradeName() {
-        return gradeName;
-    }
-    public void setGradeName(String gradeName) {
-        this.gradeName = gradeName;
-    }
-    
+    private String mobile;
     public String getUid() {
         return uid;
     }
@@ -75,7 +74,19 @@ public class UserPageHomeBo {
     public void setLvl(Integer lvl) {
         this.lvl = lvl;
     }
-    public String getNickname() {
+    public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public String getIdentifyName() {
+		return identifyName;
+	}
+	public void setIdentifyName(String identifyName) {
+		this.identifyName = identifyName;
+	}
+	public String getNickname() {
         return nickname;
     }
     public void setNickname(String nickname) {
@@ -99,52 +110,41 @@ public class UserPageHomeBo {
     public void setType(Integer type) {
         this.type = type;
     }
-    public String getPersonPortraitUrl() {
-        return personPortraitUrl;
-    }
-    public void setPersonPortraitUrl(String personPortraitUrl) {
-        this.personPortraitUrl = personPortraitUrl;
-    }
-    public String getLogoUrl() {
+    public String getHeadPortraitUrl() {
+		return headPortraitUrl;
+	}
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
+	}
+	public String getLogoUrl() {
         return logoUrl;
     }
     public void setLogoUrl(String logoUrl) {
         this.logoUrl = logoUrl;
     }
-    public Integer getPatentNum() {
-        return patentNum;
-    }
-    public void setPatentNum(Integer patentNum) {
-        this.patentNum = patentNum;
-    }
-    public Integer getCopyrightNum() {
-        return copyrightNum;
-    }
-    public void setCopyrightNum(Integer copyrightNum) {
-        this.copyrightNum = copyrightNum;
-    }
-    public Integer getTechProjectNum() {
-        return techProjectNum;
-    }
-    public void setTechProjectNum(Integer techProjectNum) {
-        this.techProjectNum = techProjectNum;
-    }
-    public Integer getDemandNum() {
-        return demandNum;
-    }
-    public void setDemandNum(Integer demandNum) {
-        this.demandNum = demandNum;
-    }
-    public Integer getAchievementNum() {
-        return achievementNum;
-    }
-    public void setAchievementNum(Integer achievementNum) {
-        this.achievementNum = achievementNum;
-    }
-    public Integer getIntellectualPropertyNum() {
-        return intellectualPropertyNum;
-    }
-    public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
-        this.intellectualPropertyNum = intellectualPropertyNum;
-    }
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getAuthentication() {
+		return authentication;
+	}
+	public void setAuthentication(Integer authentication) {
+		this.authentication = authentication;
+	}
+	@JSONField(format="yyyyMMdd")
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getMobile() {
+		return mobile;
+	}
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
 }

+ 184 - 75
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -16,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.druid.sql.parser.Token;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.IdentityAuditStatus;
@@ -25,6 +27,7 @@ import com.goafanti.common.enums.OrgProFields;
 import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.OrganizationTechFields;
 import com.goafanti.common.enums.UserAbilityFields;
+import com.goafanti.common.enums.UserAuthentication;
 import com.goafanti.common.enums.UserCareerFields;
 import com.goafanti.common.enums.UserEduFields;
 import com.goafanti.common.enums.UserIdentityFields;
@@ -42,17 +45,20 @@ import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.user.bo.InputOrgPro;
+import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputOrganizationTech;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserCareer;
 import com.goafanti.user.bo.InputUserEdu;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.UserContactBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationTechService;
 import com.goafanti.user.service.UserAbilityService;
 import com.goafanti.user.service.UserCareerService;
+import com.goafanti.user.service.UserContactService;
 import com.goafanti.user.service.UserEduService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
@@ -64,7 +70,6 @@ public class UserApiController extends BaseApiController {
 	private UserService						userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil					passwordUtil;
-
 	@Resource
 	private UserIdentityService				userIdentityService;
 	@Resource
@@ -77,6 +82,8 @@ public class UserApiController extends BaseApiController {
 	private OrganizationIdentityService		organizationIdentityService;
 	@Resource
 	private OrganizationTechService			organizationTechService;
+	@Resource
+	private UserContactService 				userContactService;
 	@Autowired
 	private EasemobUtils					easemobUtils;
 
@@ -172,40 +179,7 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 
-	/**
-	 * 个人会员基本信息
-	 * 
-	 * @param userIdentity
-	 * @param bindingResult
-	 * @return
-	 */
-	@RequestMapping(value = "/userIndentity", method = RequestMethod.POST)
-	public Result basicInfo(@Valid InputUserIdentity userIdentity, BindingResult bindingResult) {
-		Result res = new Result();
-		if (bindingResult.hasErrors()) {
-			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
-			return res;
-		}
-		if (res.getError().isEmpty()) {
-			UserIdentity ui = new UserIdentity();
-			BeanUtils.copyProperties(userIdentity, ui);
-			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
-			if (null == u && StringUtils.isBlank(ui.getId())) {
-				ui.setId(UUID.randomUUID().toString());
-				ui.setUid(TokenManager.getUserId());
-				userIdentityService.insert(ui);
-			} else {
-				if (StringUtils.isBlank(ui.getId())) {
-					res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "认证信息ID"));
-					return res;
-				}
-				userIdentityService.updateByPrimaryKeySelective(ui);
-			}
-		}
-		res.setData(userIdentity);
-		return res;
-	}
+	
 
 	/**
 	 * 公共
@@ -357,25 +331,6 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 团体会员基本信息
-	 * 
-	 * @param orgIdentityBo
-	 * @return
-	 */
-	@RequestMapping(value = "/orgIdentity", method = RequestMethod.POST)
-	public Result groupBasicInfo(@Valid OrgIdentityBo orgIdentityBo, BindingResult bindingResult) {
-		Result res = new Result();
-		if (bindingResult.hasErrors()) {
-			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					OrganizationIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
-			return res;
-		}
-		organizationIdentityService.save(orgIdentityBo);
-		res.setData(orgIdentityBo);
-		return res;
-	}
-
-	/**
 	 * 团体会员单位资料
 	 * 
 	 * @param orgInfo
@@ -428,24 +383,122 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 个人会员基本信息/团体会员基本信息
+	 * 个人会员基本信息
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/base", method = RequestMethod.GET)
-	public Result basic() {
+	@RequestMapping(value = "/getUserDetail", method = RequestMethod.GET)
+	public Result getUserDetail() {
 		Result res = new Result();
-		if (UserType.PERSONAL.getCode().equals(TokenManager.getUserType())) {
-			UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(TokenManager.getUserId());
-			res.setData(u);
-		} else {
-			OrgIdentityBo o = organizationIdentityService.selectOrgIdentityBoByUserId(TokenManager.getUserId());
-			res.setData(o);
+		UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(TokenManager.getUserId());
+		res.setData(u);
+		return res;
+	}
+	
+	/**
+	 * 个人会员基本信息
+	 * 
+	 * @param userIdentity
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
+	public Result updateUserDetail(@Valid InputUserIdentity userIdentity, BindingResult bindingResult) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
 		}
-
+		if (StringUtils.isBlank(userIdentity.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "认证信息ID"));
+			return res;
+		}
+		if(StringUtils.isBlank(userIdentity.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
+			return res;
+		}
+		if(userIdentity.getAuthentication() == UserAuthentication.PERSON_AUTHENTICATION.getCode()){
+			res.getError().add(buildError(null, "", "用户已经企业认证"));
+			return res;
+		}
+		if (res.getError().isEmpty()) {
+			UserIdentity ui = new UserIdentity();
+			User user = new User();
+			BeanUtils.copyProperties(userIdentity, ui);
+			BeanUtils.copyProperties(userIdentity, user);
+			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
+			if (null == u) {
+				ui.setId(UUID.randomUUID().toString());
+				ui.setUid(TokenManager.getUserId());
+				userIdentityService.insert(ui);
+			} else {	
+				userIdentityService.updateByPrimaryKeySelective(ui);
+			}
+			userService.updateByPrimaryKeySelective(user);
+		}
+		res.setData(userIdentity);
 		return res;
 	}
-
+	
+	/**
+	 * 企业信息详情
+	 * @return
+	 */
+	@RequestMapping(value = "/getOrganizationDetail", method = RequestMethod.GET)
+	public Result getOrganizationDetail(){
+		Result res = new Result();
+		OrgIdentityBo o = organizationIdentityService.selectOrgIdentityBoByUserId(TokenManager.getUserId());
+		res.setData(o);
+		return res;
+	}
+	
+	/**
+	 * 修改企业信息
+	 * 
+	 * @param userIdentity
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/updateOrganizationDetail", method = RequestMethod.POST)
+	public Result updateOrganizationDetail(@Valid InputOrganizationIdentity organizationIdentity, BindingResult bindingResult) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		if (StringUtils.isBlank(organizationIdentity.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "认证信息ID"));
+			return res;
+		}
+		if(StringUtils.isBlank(organizationIdentity.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
+			return res;
+		}
+		if(organizationIdentity.getAuthentication() == UserAuthentication.PERSON_AUTHENTICATION.getCode()){
+			res.getError().add(buildError(null, "", "用户已经个人认证"));
+			return res;
+		}
+		if (res.getError().isEmpty()) {
+			OrganizationIdentity oi = new OrganizationIdentity();
+			User user = new User();
+			BeanUtils.copyProperties(organizationIdentity, oi);
+			BeanUtils.copyProperties(organizationIdentity, user);
+			OrgIdentityBo u = organizationIdentityService.selectOrgIdentityBoByUserId(TokenManager.getUserId());
+			if (null == u) {
+				oi.setId(UUID.randomUUID().toString());
+				oi.setUid(TokenManager.getUserId());
+				organizationIdentityService.insert(oi);
+			} else {	
+				organizationIdentityService.updateByPrimaryKeySelective(oi);
+			}
+			userService.updateByPrimaryKeySelective(user);
+		}
+		res.setData(organizationIdentity);
+		return res;
+	}
+	
 	/**
 	 * 个人资料/团体会员资料
 	 */
@@ -615,16 +668,6 @@ public class UserApiController extends BaseApiController {
 		return dealUserProcess(res, userIdentity, TokenManager.getUserId());
 	}
 
-	
-	/**
-	 * 获取公司联系人
-	 */
-	@RequestMapping(value = "/getContacts", method = RequestMethod.GET)
-	public Result getContacts() {
-		Result res = new Result();
-		res.setData(organizationIdentityService.selectContactsByUserId(TokenManager.getUserId()));
-		return res;
-	}
 
 	// 认证失败清除相关认证信息
 	private Result dealFaild(Result res) {
@@ -672,4 +715,70 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	/**
+	 * 新增客户联系人
+	 * @param bo
+	 * @return
+	 */
+	@RequestMapping(value = "/addUserContcat", method = RequestMethod.POST)
+	public Result addUserContcat(UserContactBo bo){
+		Result res = new Result();
+		if(StringUtils.isBlank(bo.getMobile())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "手机号码不能为空"));
+			return res;
+		}
+		if(userContactService.checkUserContact(TokenManager.getUserId(), bo.getMobile())){
+			res.getError().add(buildError(ErrorConstants.USER_CONTACT_ALREADY_EXIST,"联系人已存在"));
+		}
+		userContactService.insertSelective(bo);
+		return res;
+	}
+	
+	/**
+	 * 修改客户联系人
+	 * @param bo
+	 * @return
+	 */
+	@RequestMapping(value = "/udpateUserContact", method = RequestMethod.POST)
+	public Result udpateUserContact(UserContactBo bo){
+		Result res = new Result();
+		if(StringUtils.isBlank(bo.getMobile())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "手机号码不能为空"));
+			return res;
+		}
+		if(StringUtils.isBlank(bo.getId())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "联系人ID"));
+			return res;
+		}
+		userContactService.updateByPrimaryKeySelective(bo);
+		return res;
+	}
+	
+	/**
+	 * 删除客户联系人
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteUserContact", method = RequestMethod.GET)
+	public Result deleteUserContact(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "联系人ID"));
+			return res;
+		}
+		userContactService.deleteUserContact(id);
+		return res;
+	}
+	
+	/**
+	 * 获取用户联系人
+	 * @return
+	 */
+	@RequestMapping(value = "/getUserContacts", method = RequestMethod.GET)
+	public Result getUserContacts(){
+		Result res = new Result();
+		res.setData(userContactService.selectContactByUid(TokenManager.getUserId()));
+		return res;
+	}
 }

+ 0 - 104
src/main/java/com/goafanti/user/controller/UserPartnerApiController.java

@@ -1,104 +0,0 @@
-package com.goafanti.user.controller;
-
-import javax.annotation.Resource;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.demand.service.DemandService;
-import com.goafanti.user.service.UserService;
-
-@RestController
-@RequestMapping(value = "/api/user/partner")
-public class UserPartnerApiController extends CertifyApiController {
-	@Resource
-	private UserService userService;
-	@Resource
-	private DemandService demandService;
-	@Resource
-	private AchievementService achievementService;
-
-	/**
-	 * "伙伴"主页详情
-	 */
-	@RequestMapping(value = "/detail", method = RequestMethod.GET)
-	public Result detail(String uid, Integer type) {
-		Result res = new Result();
-
-		if (StringUtils.isBlank(uid)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
-			return res;
-		}
-		
-		if (null == type) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
-			return res;
-		}
-
-		if (!UserType.PERSONAL.getCode().equals(type) && !UserType.ORGANIZATION.getCode().equals(type)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户类型"));
-			return res;
-		}
-		
-		if (UserType.PERSONAL.getCode().equals(type)) {
-			res.setData(userService.findUserPartnerDetail(uid));
-		} else {
-			res.setData(userService.findOrgPartnerDetail(uid));
-		}
-		return res;
-	}
-	
-	/**
-	 * "伙伴"主页--科技需求列表
-	 */
-	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
-	public Result demandList(String employerId, String pageNo, String pageSize) {
-		Result res = new Result();
-		if (StringUtils.isBlank(employerId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "employerId"));
-			return res;
-		}
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(demandService.lisePartnerDemand(employerId, pNo, pSize));
-		return res;
-	}	
-
-	/**
-	 * "伙伴"主页--科技成果列表
-	 */
-	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	public Result achievementList(String ownerId, String pageNo, String pageSize){
-		Result res = new Result();
-		if (StringUtils.isBlank(ownerId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "ownerId"));
-			return res;
-		}
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(achievementService.listPartnerAchievement(ownerId, pNo, pSize));
-		return res;
-	}
-	 
-}

+ 0 - 5
src/main/java/com/goafanti/user/service/UserCareerService.java

@@ -9,9 +9,4 @@ public interface UserCareerService {
 	UserCareer insert(UserCareer userCareer);
 
 	int updateByPrimaryKeySelective(UserCareer userCareer);
-
-	
-
-	
-
 }

+ 18 - 0
src/main/java/com/goafanti/user/service/UserContactService.java

@@ -0,0 +1,18 @@
+package com.goafanti.user.service;
+
+import java.util.List;
+
+import com.goafanti.user.bo.UserContactBo;
+
+public interface UserContactService {
+	
+	List<UserContactBo> selectContactByUid(String uid);
+	
+	boolean checkUserContact(String uid,String mobile);
+	
+	int insertSelective(UserContactBo bo);
+	
+	int updateByPrimaryKeySelective(UserContactBo bo);
+
+	int deleteUserContact(String id);
+}

+ 2 - 2
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -39,11 +39,11 @@ public interface UserIdentityService {
 			Integer area,Integer international, Integer pNo, Integer pSize);
 
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
-	
+
 	UserIdentityBo expertsDetail(String uid);
 
 	Pagination<UserIdentityBo> expertsList(String name,String industry, Integer pNo, Integer pSize);
-
+	
 	List<fieldGlossoryBo> industryList();
 
 	 Pagination<consultantListBo> consultantList(Integer pNo, Integer pSize) ;

+ 0 - 21
src/main/java/com/goafanti/user/service/UserService.java

@@ -5,15 +5,10 @@ import java.util.Map;
 
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.model.User;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgUnitNames;
-import com.goafanti.user.bo.StarAndExpertListBo;
-import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
-import com.goafanti.user.bo.UserPartnerDetailBo;
 
 public interface UserService {
 
@@ -35,10 +30,6 @@ public interface UserService {
 
 	UserDownLoadBo selectUserDownLoadBoByUserId(String userId);
 
-	Pagination<OrgListBo> selectUserByAid(Integer number, String mobile, Integer auditStatus, String auditName,
-			String email, String adminId, String startCreateTime, String endCreateTime, Integer type, Integer pNo,
-			Integer pSize);
-
 	List<OrgUnitNames> selectDemandUnitNames();
 
 	List<UserNames> selectDemandUserNames();
@@ -51,18 +42,6 @@ public interface UserService {
 
 	String findOrgNameByNameAndMobile(String name, String mobile);
 
-	UserPartnerDetailBo findUserPartnerDetail(String uid);
-
-	Object findOrgPartnerDetail(String uid);
-
-	Pagination<StarListBo> listStar(Integer number, String engagedField, String username, String professionalTitle,
-			String workUnit, Integer pNo, Integer pSize);
-
-	Pagination<StarAndExpertListBo> listStarAndExpert(Integer number, String engagedField, String username,
-			String professionalTitle, String workUnit, Integer pNo, Integer pSize);
-
-	List<UserPartnerDetailBo> findUserPartner();
-
 	UserBasicInfo selectBaseInfo();
 	
 	User selectByNumber(String easemobName);

+ 57 - 0
src/main/java/com/goafanti/user/service/impl/UserContactServiceImpl.java

@@ -0,0 +1,57 @@
+package com.goafanti.user.service.impl;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationContactBookMapper;
+import com.goafanti.common.model.OrganizationContactBook;
+import com.goafanti.user.bo.UserContactBo;
+import com.goafanti.user.service.UserContactService;
+
+@Service
+public class UserContactServiceImpl implements UserContactService {
+	
+	private OrganizationContactBookMapper organizationContactBookMapper;
+	
+	@Override
+	public List<UserContactBo> selectContactByUid(String uid) {
+		// TODO Auto-generated method stub
+		return organizationContactBookMapper.selectContactByUid(uid);
+	}
+
+	@Override
+	public boolean checkUserContact(String uid,String mobile) {
+		// TODO Auto-generated method stub
+		return organizationContactBookMapper.checkContacts(uid, mobile, null)>0;
+	}
+
+	@Override
+	public int insertSelective(UserContactBo bo) {
+		OrganizationContactBook book = new OrganizationContactBook();
+		if(bo != null){
+			BeanUtils.copyProperties(bo, book);
+			book.setId(UUID.randomUUID().toString());
+			return organizationContactBookMapper.insertSelective(book);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(UserContactBo bo) {
+		OrganizationContactBook book = new OrganizationContactBook();
+		if(bo != null){
+			BeanUtils.copyProperties(bo, book);
+			return organizationContactBookMapper.updateByPrimaryKeySelective(book);
+		}
+		return 0;
+	}
+
+	@Override
+	public int deleteUserContact(String id) {
+		return organizationContactBookMapper.deleteByPrimaryKey(id);
+	}
+	
+}

+ 5 - 6
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -307,9 +307,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@Override
 	public UserIdentityBo expertsDetail(String uid) {
-		
 		UserIdentityBo u=userIdentityMapper.selectUserIdentityByUid(uid);
-		if (null!=u.getProvince()) {
+/*		if (null!=u.getProvince()) {
 			u.setProvince0(districtGlossoryMapper.selectByPrimaryKey(u.getProvince()).getName());
 		}
 		if (null!=u.getCity()) {
@@ -330,7 +329,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		}else {
 			u.setInterest("0");
 		}
-		return u;
+*/		return u;
 	}
 
 	@SuppressWarnings("unchecked")
@@ -354,12 +353,12 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		Pagination<UserIdentityBo> p= (Pagination<UserIdentityBo>) findPage("findUserIdentityListByPage",
 				"findUserIdentityCount", params, pNo, pSize);
 		List<UserIdentityBo> l=(List<UserIdentityBo>) p.getList();
-		for (UserIdentityBo u : l) {
+		/*for (UserIdentityBo u : l) {
 			int i=userInterestMapper.countInterest(u.getUid());
 				u.setCountInterest(String.valueOf(i));
-		}
+		}*/
 		return p;
-		}
+	}
 		
 	
 

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java

@@ -98,10 +98,10 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 				"findUserCareerCount",params,
 				pNo, pSize);
 		List<UserIdentityBo> list=(List<UserIdentityBo>) p.getList();
-		for (UserIdentityBo d : list) {
+		/*for (UserIdentityBo d : list) {
 			int i=userInterestMapper.countByToUid(d.getUid());
 			d.setCountInterest(String.valueOf(i));
-		}
+		}*/
 		return p;
 	}
 

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

@@ -16,21 +16,13 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.User;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.bo.OrgListBo;
-import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
-import com.goafanti.user.bo.StarAndExpertListBo;
-import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
-import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.user.service.UserService;
 
 @Service
@@ -112,70 +104,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.selectUserDownLoadBoByUserId(id);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<OrgListBo> selectUserByAid(Integer number, String mobile, Integer auditStatus, String auditName,
-			String email, String aid, String startCreateTime, String endCreateTime, Integer type, Integer pageNo,
-			Integer pageSize) {
-		Map<String, Object> params = new HashMap<>();
-
-		if (StringUtils.isNotBlank(startCreateTime)) {
-			try {
-				params.put("startCreateTime", DateUtils.parseDate(startCreateTime, AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-			}
-		}
-
-		if (StringUtils.isNotBlank(endCreateTime)) {
-			try {
-				params.put("endCreateTime",
-						DateUtils.addDays(DateUtils.parseDate(endCreateTime, AFTConstants.YYYYMMDD), 1));
-			} catch (ParseException e) {
-			}
-		}
-
-		if (null != number) {
-			params.put("number", number);
-		}
-
-		if (StringUtils.isNotBlank(mobile)) {
-			params.put("mobile", mobile);
-		}
-
-		if (null != auditStatus) {
-			params.put("auditStatus", auditStatus);
-		}
-
-		if (StringUtils.isNotBlank(auditName)) {
-			params.put("auditName", auditName);
-		}
-
-		if (StringUtils.isNotBlank(email)) {
-			params.put("email", email);
-		}
-
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			params.put("aid", aid);
-		}
-
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0 || pageSize > 10) {
-			pageSize = 10;
-		}
-
-		if (UserType.PERSONAL.getCode().equals(type)) {
-			return (Pagination<OrgListBo>) findPage("findUserByAidWithParamsListByPage", "findUserByAidWithParamsCount",
-					params, pageNo, pageSize);
-		} else if (UserType.ORGANIZATION.getCode().equals(type)) {
-			return (Pagination<OrgListBo>) findPage("findOrgByAidWithParamsListByPage", "findOrgByAidWithParamsCount",
-					params, pageNo, pageSize);
-		}
-		return null;
-	}
-
 	@Override
 	public List<OrgUnitNames> selectDemandUnitNames() {
 		String aid = TokenManager.getAdminId();
@@ -249,114 +177,25 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.findOrgByNameAndMobile(name, mobile);
 	}
 
-	@Override
-	public UserPartnerDetailBo findUserPartnerDetail(String uid) {
-		return userMapper.findUserPartnerDetail(uid);
-	}
-
-	@Override
-	public OrgPartnerDetailBo findOrgPartnerDetail(String uid) {
-		return userMapper.findOrgPartnerDetail(uid);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<StarListBo> listStar(Integer number, String engagedField, String username,
-			String professionalTitle, String workUnit, Integer pNo, Integer pSize) {
-		Map<String, Object> params = new HashMap<>();
-
-		if (null != number) {
-			params.put("number", number);
-		}
-
-		if (StringUtils.isNotBlank(engagedField)) {
-			params.put("engagedField", engagedField);
-		}
-
-		if (StringUtils.isNotBlank(username)) {
-			params.put("username", username);
-		}
-
-		if (StringUtils.isNotBlank(professionalTitle)) {
-			params.put("professionalTitle", professionalTitle);
-		}
-
-		if (StringUtils.isNotBlank(workUnit)) {
-			params.put("workUnit", workUnit);
-		}
-
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		return (Pagination<StarListBo>) findPage("findStarListByPage", "findStarCount", params, pNo, pSize);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<StarAndExpertListBo> listStarAndExpert(Integer number, String engagedField, String username,
-			String professionalTitle, String workUnit, Integer pNo, Integer pSize) {
-		Map<String, Object> params = new HashMap<>();
-
-		if (null != number) {
-			params.put("number", number);
-		}
-
-		if (StringUtils.isNotBlank(engagedField)) {
-			params.put("engagedField", engagedField);
-		}
-
-		if (StringUtils.isNotBlank(username)) {
-			params.put("username", username);
-		}
-
-		if (StringUtils.isNotBlank(professionalTitle)) {
-			params.put("professionalTitle", professionalTitle);
-		}
-
-		if (StringUtils.isNotBlank(workUnit)) {
-			params.put("workUnit", workUnit);
-		}
-
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		return (Pagination<StarAndExpertListBo>) findPage("findStarAndExpertListByPage", "findStarAndExpertCount",
-				params, pNo, pSize);
-	}
 
 	@Override
 	@Cacheable(value = "UserNumberCache", key = "'UserNumberCache:UID:'+#userId")
 	public String selectNumberByPrimaryKey(String userId) {
 		return String.valueOf(userMapper.selectNumberByPrimaryKey(userId));
-	}
-
-	@Override
-	public List<UserPartnerDetailBo> findUserPartner() {
-		return userMapper.findUserPartner();
-	}
+	}	
 
 	@Override
 	public UserBasicInfo selectBaseInfo() {
 		if(TokenManager.getToken() instanceof User)return userMapper.selectBaseInfo(TokenManager.getUserId());
 		return null;
 	}
+	@Override
+	public List<User> selectUserByRoleName(String roleName){
+		return userMapper.selectUserByRoleName(roleName);
+	}
 
 	@Override
 	public User selectByNumber(String easemobName) {
-		
 		return userMapper.selectByNumber(easemobName);
 	}
-	
-	@Override
-	public List<User> selectUserByRoleName(String roleName){
-		return userMapper.selectUserByRoleName(roleName);
-	}
 }

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

@@ -127,4 +127,6 @@ PAY_BEYOND_SIGN = \u652F\u4ED8\u91D1\u989D\u8D85\u8FC7\u5408\u540C\u4EF7\u683C
 
 REFUND_BEYOND_SIGN = \u9000\u6B3E\u91D1\u989D\u8D85\u8FC7\u5408\u540C\u4EF7\u683C
 
-BILL_ALREADY_EXPIRE = \u8BE5\u6D41\u6C34\u5DF2\u8FC7\u671F
+BILL_ALREADY_EXPIRE = \u8BE5\u6D41\u6C34\u5DF2\u8FC7\u671F
+
+USER_CONTACT_ALREADY_EXIST = \u8054\u7CFB\u4EBA\u5DF2\u5B58\u5728