Merge remote-tracking branch 'origin/developer' into developer

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

@@ -89,7 +89,7 @@ public interface ExternalClerkRelatedApiService {
      * @author mozhu
      * @date 2022-02-09 16:57:19
      */
-    void bindMemberIdExternalById(String externalClerkRelatedId, String enterpriseId, String memberId, String unionid);
+    boolean bindMemberIdExternalById(String externalClerkRelatedId, String enterpriseId, String memberId, String unionid);
 
     /**
      * 查询clerk与union好友关系

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

@@ -151,13 +151,13 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         ServiceResponse<ExternalClerkRelatedDTO> resp = new ServiceResponse<>();
         TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey);
         if (null == externalClerkRelated) {
-            log.error("relationKey对应的关联关系不存在或删除：relationKey:{},memberId:{},unionid:{}",relationKey,memberId,unionid);
+            log.error("relationKey对应的关联关系不存在或删除：relationKey:{},memberId:{},unionid:{}", relationKey, memberId, unionid);
             resp.setCode(0);
             resp.setMessage("relationKey对应的关联关系不存在或删除");
             return resp;
         }
         if (!externalClerkRelated.getEnterpriseId().equals(enterpriseId)) {
-            log.error("relationKey对应的企业与所传会员企业不对应：relationKey:{},memberId:{},unionid:{}",relationKey,memberId,unionid);
+            log.error("relationKey对应的企业与所传会员企业不对应：relationKey:{},memberId:{},unionid:{}", relationKey, memberId, unionid);
             resp.setCode(0);
             resp.setMessage("relationKey对应的企业与所传会员企业不对应");
             return resp;
@@ -168,17 +168,19 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
-    public void bindMemberIdExternalById(String externalClerkRelatedId, String enterpriseId, String memberId, String unionid) {
+    public boolean bindMemberIdExternalById(String externalClerkRelatedId, String enterpriseId, String memberId, String unionid) {
         TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.selectByPrimaryKey(externalClerkRelatedId);
         if (externalClerkRelated == null) {
-            log.error("查询好办与gic数据为空,externalClerkRelatedId:{},enterpriseId:{},memberId:{},unionid:{}",externalClerkRelatedId,enterpriseId,memberId,unionid);
-            return;
+            log.error("查询好办与gic数据为空,externalClerkRelatedId:{},enterpriseId:{},memberId:{},unionid:{}", externalClerkRelatedId, enterpriseId, memberId, unionid);
+            return false;
         }
         updateExternalClerkRelated(enterpriseId, memberId, unionid, externalClerkRelated);
+        return true;
     }
 
     /**
      * 更新好友关系
+     *
      * @param enterpriseId
      * @param memberId
      * @param unionid
@@ -222,7 +224,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         try {
             clientInstance.sendMessage("qywxTagSyncDeal", JSONObject.toJSONString(pojo));
         } catch (Exception e) {
-            log.info("异常：{}", e.getMessage(),e);
+            log.info("异常：{}", e.getMessage(), e);
         }
     }
 

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

@@ -1822,9 +1822,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                         log.info("查询不到好友wxEnterpriseId:{}, wxUserId:{}, enterpriseId:{}, externalUserid:{}", wxEnterpriseId, wxUserId, enterpriseId, externalUserid);
                         continue;
                     }
-                    externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
-                    //调用会员接口来自企微
-                    memberStoreService.saveMemberStoreClerkRelation(memberId,externalClerkRelated.getStoreId(),externalClerkRelated.getClerkId(),"企微好友");
+                    boolean flag = externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
+                    if (flag) {
+                        //调用会员接口来自企微
+                        memberStoreService.saveMemberStoreClerkRelation(memberId,externalClerkRelated.getStoreId(),externalClerkRelated.getClerkId(),"企微好友");
+                    }
                 }
             }
         }