fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -42,4 +42,6 @@ public interface MemberUnionidRelatedApiService {
 
 	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
+	void mqFreshWxFrend(String res);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -277,7 +277,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		log.info("【新增外部联系人回调】unionIdJson={}",JSON.toJSONString(unionIdJson));
 		
 		ExternalUserPojo pojo = getExternalUserPojo(unionIdJson,userId,wxEnterpriseId);
-		String unionId = pojo.getUnionId();
+		//String unionId = pojo.getUnionId();
 		String name = pojo.getName();
 		String createTime  = pojo.getAddCreateTime();
 		
@@ -285,29 +285,34 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		RedisUtil.lock(key,2l);
 		dto.setWxEnterpriseId(wxEnterpriseId);
 		
-		dto.setUnionid(unionId);
+		//dto.setUnionid(unionId);
 		dto.setExternalName(name);
 		dto.setAddCreateTime(createTime);
 		
 		MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(dto.getWxUserId(), wxEnterpriseId,name,createTime);
+		String externalUserId = "";
+		String selfExternalUserId = "";
+		String unionId = "";
+		if(SELF_APP.equals(suiteid)){
+			unionId = pojo.getUnionId();
+			selfExternalUserId = dto.getExternalUserid(); 
+		}else{
+			externalUserId = dto.getExternalUserid();
+		}
+		
 		
 		String uuid = "";
 		if(exsitDTO == null){
-			if(SELF_APP.equals(suiteid)){
-				dto.setSelfExternalUserid(dto.getExternalUserid());
-			}else{
-				dto.setExternalUserid(dto.getExternalUserid());
-			}
+			dto.setSelfExternalUserid(externalUserId);
+			dto.setExternalUserid(selfExternalUserId);
+			dto.setUnionid(unionId);
 			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
 		}else{
 			//如果是自建更新uuid
-			if(SELF_APP.equals(suiteid)){
-				dto.setSelfExternalUserid(dto.getExternalUserid());
-				exsitDTO.setUnionid(unionId);
-			}else{
-				//更新对外联系人id
-				exsitDTO.setExternalUserid(dto.getExternalUserid());
-			}
+			exsitDTO.setSelfExternalUserid(selfExternalUserId);
+			exsitDTO.setUnionid(unionId);
+			//更新对外联系人id
+			exsitDTO.setExternalUserid(externalUserId);
 			memberUnionRelatedService.update(exsitDTO);
 			uuid = exsitDTO.getMemberUnionidRelatedId();
 		}
@@ -605,6 +610,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		
 	}
+	
+	@Override
+	public void mqFreshWxFrend(String res){
+		JSONObject json = JSON.parseObject(res);
+		String wxEnterpriseId = json.getString("wxEnterpriseId");
+		String wxUserId = json.getString("wxUserId");
+		String storeId = json.getString("storeId");
+		log.info("【刷下微信好友】wxEnterpriseId={}.wxUserId={},storeId={}",wxEnterpriseId,wxUserId,storeId);
+		if(StringUtils.isAnyBlank(wxEnterpriseId,wxUserId,storeId)){
+			return ;
+		}
+		freshWxFrend(wxEnterpriseId, wxUserId, storeId);
+	}
 
 	@Override
 	public void cleanByCid(String cid) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -27,6 +27,7 @@ import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.GICMQClientUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -60,6 +61,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
+import com.gic.haoban.manage.web.utils.RouterConstant;
 import com.gic.haoban.manage.web.vo.BindClerkVO;
 import com.gic.haoban.manage.web.vo.ClerkStoreVO;
 import com.gic.haoban.manage.web.vo.ClerkVo;
@@ -423,6 +425,17 @@ public class ClerkController extends WebBaseController{
 		Integer count =  RedisUtil.getCache(key) == null ? 0 : (Integer)RedisUtil.getCache(key);
 		if(count == null || count < 4){
 			RedisUtil.setCache(key,count + 1,31 * 24 * 60 * 60l);
+			JSONObject json = new JSONObject();
+			json.put("wxUserId", staff.getWxUserId());
+			json.put("wxEnterpriseId", wxEnterpriseId);
+			json.put("storeId", storeId);
+			logger.info("【刷下微信好友】{},{},{}",RouterConstant.FRESH_WX_FRIEND_SERVICENAME,RouterConstant.INIT_FRESH_WX_FRIEND_METHODNAME,json.toJSONString());
+	        try {
+				GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, json.toJSONString(),
+						RouterConstant.FRESH_WX_FRIEND_SERVICENAME, RouterConstant.INIT_FRESH_WX_FRIEND_METHODNAME);
+			} catch (Exception e) {
+				logger.info(e.getMessage(),e);
+			}
 			memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId(),storeId);
 			
 		}else{

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/RouterConstant.java

+package com.gic.haoban.manage.web.utils;
+
+public class RouterConstant {
+
+	public static final String FRESH_WX_FRIEND_SERVICENAME = "com.gic.haoban.manage.api.service";
+	public static final String INIT_FRESH_WX_FRIEND_METHODNAME = "mqFreshWxFrend";
+	public static final String ROUTERTYPE = "commonRouter";
+
+}