Merge branch 'master' into developer

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

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

@@ -355,17 +355,16 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String createTime = dto.getAddCreateTime();
         String externalUserid = dto.getExternalUserid();
         String avatar = dto.getAvatar();
-        //好友不开卡 发送欢迎语
         if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
             log.info("不同开平，走欢迎语逻辑，wxEnterpriseId：{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
             return;
         }
-
         log.info("同一开平，创建关联关系...");
         String unionId = dto.getUnionid();
-        if (unionId == null) {
-            log.info("unionid 不存在，wxEnterpriseId：{},wxUserId:{}", wxEnterpriseId, wxUserId);
+        if (StringUtils.isBlank(unionId)) {
+            log.info("unionid不存在,走发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
+            addFriendByWelcome(dto, staffClerkRelationDTO);
             return;
         }
         //新增导购和外部联系人关系
@@ -687,12 +686,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             }
             memberUnionRelatedService.update(dto);
             RedisUtil.unlock(lockKey);
-            RedisUtil.delCache(key);
             return dto;
         } else {
+            RedisUtil.setCache(key, dto, 60L);
             String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
             dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
-            RedisUtil.setCache(key, dto, 60L);
             RedisUtil.unlock(lockKey);
             return null;
         }