好办小程序权限调整

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

@@ -89,12 +89,12 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public void insert(TabHaobanExternalClerkRelated related) {
         String clerkId = related.getClerkId();
         String externalUserId = related.getExternalUserId();
-        String lockKey = "addExternalUser:"+externalUserId ;
+        String lockKey = "addExternalUser:"+externalUserId+clerkId ;
         int num1 = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
         if(num1 > 0) {
             return ;
         }
-        RedisUtil.lock(lockKey,1L);
+        RedisUtil.lock(lockKey,2L);
         int num2 = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
         logger.info("好友数={},{},{}",num1,num2,externalUserId);
         if (num2 == 0) {

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

@@ -630,6 +630,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(null != hmId) {
             this.hmQrcodeApiService.updateAddNumById(hmId, hyClerkId);
         }
+        // 并发控制
+        String cacheKey = "qwAddLog"+externalUserId+staffId ;
+        if(null != RedisUtil.getCache(cacheKey)) {
+            return;
+        }
+        String lockKey = cacheKey+"lock" ;
+        RedisUtil.lock(lockKey,2L);
+        if(null != RedisUtil.getCache(cacheKey)) {
+            return;
+        }
+        RedisUtil.setCache(cacheKey,5L);
        //设置会员标签
        this.setMemberTag(enterpriseId, memberLabelId, memberId);
        //加好友增加数量
@@ -648,6 +659,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
        wxUserAddLogQDTO.setClerkId(hyClerkId);
        wxUserAddLogQDTO.setAddWay(dto.getAddWay());
        this.wxUserAddLogService.save(wxUserAddLogQDTO);
+       RedisUtil.unlock(lockKey);
        if(StringUtils.isNotBlank(memberId)) {
            this.groupChatService.matchGicMember(wxEnterpriseId, enterpriseId, memberId, externalUserId);
        }