Browse Source

APP接口BUG修改

anderx 8 years ago
parent
commit
74609b3e9b

+ 7 - 0
src/main/java/com/goafanti/app/bo/consultantListBo.java

@@ -8,6 +8,7 @@ public class consultantListBo {
 	private String consultant;
 	private String interest;
 	private String reservationCount;
+	private String easemobName;
 	public String getId() {
 		return id;
 	}
@@ -51,4 +52,10 @@ public class consultantListBo {
 	public void setReservationCount(String reservationCount) {
 		this.reservationCount = reservationCount;
 	}
+	public String getEasemobName() {
+		return easemobName;
+	}
+	public void setEasemobName(String easemobName) {
+		this.easemobName = easemobName;
+	}
 }

+ 5 - 3
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -1021,8 +1021,9 @@
 	</select> 
 	 <select id="selectUserIdentityByUid" resultType="com.goafanti.user.bo.UserIdentityBo">
 	 	select 	t.id ,t.uid,t.username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,
-			t.industry,t.city,u.introduction,u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount
+			t.industry,t.city,u.introduction,u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
 	from user_identity t left JOIN user u on t.uid = u.id
+	 left join jpush_easemob_account j on t.uid=j.uid
 	left join (select count(0) as x,seller_id from t_order
 				where order_status != 4
 				group by  seller_id ) o on t.uid=o.seller_id
@@ -1036,7 +1037,7 @@
 	left join (select count(0) as x,seller_id from t_order
 				where order_status != 4
 				group by  seller_id ) o on t.uid=o.seller_id
-	where 1=1
+	where expert=1
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>
@@ -1081,9 +1082,10 @@
   
   <select id="selectconsultantByUid" parameterType="java.lang.String" resultType="com.goafanti.app.bo.consultantListBo">
   	select 
-  		t.uid as id ,t.username ,t.consultant,u.head_portrait_url as headPortraitUrl,u.introduction,ifnull(o.x,0) as reservationCount
+  		t.uid as id ,t.username ,t.consultant,u.head_portrait_url as headPortraitUrl,u.introduction,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
   	from  user_identity t 
   	left join user u on t.uid =u.id
+  	 left join jpush_easemob_account j on t.uid=j.uid
   	left join (select count(0) as x,seller_id from t_order
 				where order_status != 4
 				group by  seller_id ) o on t.uid=o.seller_id

+ 9 - 0
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -16,6 +16,7 @@ public class UserIdentityBo extends UserIdentity {
 	private String countInterest;
 	private String interest;
 	private String reservationCount;
+	private String easemobName;
 	public String getProvince0() {
 		return province0;
 	}
@@ -131,6 +132,14 @@ public class UserIdentityBo extends UserIdentity {
 		this.reservationCount = reservationCount;
 	}
 
+	public String getEasemobName() {
+		return easemobName;
+	}
+
+	public void setEasemobName(String easemobName) {
+		this.easemobName = easemobName;
+	}
+
 	
 	
 

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

@@ -305,7 +305,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@Override
 	public UserIdentityBo expertsDetail(String uid) {
-		System.out.println(uid);
+		
 		UserIdentityBo u=userIdentityMapper.selectUserIdentityByUid(uid);
 		if (null!=u.getProvince()) {
 			u.setProvince0(districtGlossoryMapper.selectByPrimaryKey(u.getProvince()).getName());