加好友删好友通知

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

@@ -186,7 +186,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         }
         wxUserAddLogService.save(wxUserAddLogQDTO);
         //定制
-        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0,related.getExternalUserId());
     }
 
     /**
@@ -198,7 +198,22 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType , String externalUserid) {
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        if(StringUtils.isNotBlank(memberId)) {
+            logger.info("加好友、删好友通知={}",memberId);
+            JSONObject json  = new JSONObject() ;
+            json.put("enterpriseId",enterpriseId) ;
+            json.put("clerkId",clerkId) ;
+            json.put("memberId",memberId) ;
+            json.put("externalUserid",externalUserid) ;
+            json.put("changeType",changeType);
+            try {
+                clientInstance.sendMessage("qywxAddFriendEvent", json.toJSONString());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
         String addDelFriendEvent = config.getAddDelFriendEvent();
         if (!addDelFriendEvent.contains(wxEnterpriseId)) {
             logger.info("非定制，无需广播通知");
@@ -218,7 +233,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             logger.info("会员不存在:{}", memberId);
             return;
         }
-        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             JSONObject msgBody = new JSONObject();
             msgBody.put("cardNo", member.getCardNum());

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

@@ -871,16 +871,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 欧泊莱定制需求
      */
+    // changeType 0删好友 1加好友
     private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType , String externalUserid , boolean isNewMember) {
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
-        if(changeType==1) {
-            log.info("加好友通知={}",memberId);
+        if(StringUtils.isNotBlank(memberId)) {
+            log.info("加好友、删好友通知={}",memberId);
             JSONObject json  = new JSONObject() ;
             json.put("enterpriseId",enterpriseId) ;
             json.put("clerkId",clerkId) ;
             json.put("memberId",memberId) ;
             json.put("externalUserid",externalUserid) ;
             json.put("isNewMember",isNewMember) ;
+            json.put("changeType",changeType);
             try {
                 clientInstance.sendMessage("qywxAddFriendEvent", json.toJSONString());
             } catch (Exception e) {