zoujiajian 1 rok pred
rodič
commit
e1fce12fed

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/CorpKfUser.java

@@ -24,6 +24,9 @@ public class CorpKfUser extends BaseEntity{
 
 	private String avatar;
 
+	/**
+	 * 微信客服备注
+	 */
 	private String remark;
 
 	/**

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/views/TicketView.java

@@ -49,6 +49,9 @@ public class TicketView {
 	@DbField("a.password")
 	private String password;
 
+	@DbField("if(a.api_secret='',false,true)")
+	private Boolean isVerify;
+
 	/**
 	 * 国区id
 	 */

+ 7 - 0
netflix-dao/src/main/java/com/cyksj/model/views/YHLXUserDetailView.java

@@ -1,6 +1,7 @@
 package com.cyksj.model.views;
 
 import com.cyksj.model.entity.Address;
+import com.cyksj.model.entity.CorpKfUser;
 import com.cyksj.model.entity.User;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
@@ -67,4 +68,10 @@ public class YHLXUserDetailView {
 	 */
 	@DbIgnore
 	private Boolean isVip;
+
+	/**
+	 * 微信客服 用户信息
+	 */
+	@DbIgnore
+	private CorpKfUser corpKfUser;
 }

+ 7 - 0
netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpUserServiceImpl.java

@@ -8,6 +8,7 @@ import com.cyksj.config.corp.WeChatCorpFactory;
 import com.cyksj.mapper.*;
 import com.cyksj.mapper.corp.CorpUserAuthMapper;
 import com.cyksj.mapper.corp.CorpUserMapper;
+import com.cyksj.mapper.corp.kf.CorpKfUserMapper;
 import com.cyksj.mapper.market.task.UserBindDetailMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.kf.CorpKfUserInfo;
@@ -65,6 +66,8 @@ public class CorpUserServiceImpl implements CorpUserService {
 
 	private final WxCorpOps wxCorpOps;
 
+	private final CorpKfUserMapper corpKfUserMapper;
+
 	@Override
 	public YHLXUserDetailView getUserDetailView(String externalUserid, String corpId) throws Exception {
 		CorpUser corpUser = getExternalUserId(corpId, externalUserid);
@@ -123,6 +126,10 @@ public class CorpUserServiceImpl implements CorpUserService {
 				.in(UserIdentity::getUserId, userIdList)
 				.eq(UserIdentity::getTag, UserIdentity.Tag.VIP));
 		view.setIsVip(count2 > 0);
+		//微信客服用户信息
+		view.setCorpKfUser(corpKfUserMapper.selectOne(Wrappers.lambdaQuery(CorpKfUser.class)
+				.eq(CorpKfUser::getExternalUserid, externalUserid)
+				.last("limit 1")));
 		return view;
 	}