登录信息

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

@@ -560,7 +560,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             related.setPushTimes(1);
             related.setWxEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId());
 			related.setWxUserId(dto.getWxUserId());
-			externalClerkRelatedService.insert(related);
+            related.setHeadUrl(dto.getAvatar());
+            externalClerkRelatedService.insert(related);
 		} else {
 			log.info("更新TabHaobanExternalClerkRelated");
 			TabHaobanExternalClerkRelated exsitDTO = externalClerkRelateds.get(0);
@@ -570,7 +571,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			exsitDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
 			exsitDTO.setClerkId(staffClerkRelationDTO.getClerkId());
 			exsitDTO.setRelationKey(relationKey);
-			externalClerkRelatedService.update(exsitDTO);
+            exsitDTO.setHeadUrl(dto.getAvatar());
+            externalClerkRelatedService.update(exsitDTO);
 		}
         sendWelcome(dto, staffClerkRelationDTO, true);
     }
@@ -705,19 +707,21 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String key = "external" + dto.getWxEnterpriseId() + "_" + dto.getWxUserId() + "_" + dto.getExternalName() + "_" + dto.getAddCreateTime();
         String lockKey = key + "-lock";
         RedisUtil.lock(lockKey, 3L);
-        String memberUnionidRelatedId = (String) RedisUtil.getCache(key);
-        if (memberUnionidRelatedId != null) {
-            MemberUnionidRelated memberUnionidRelated = memberUnionidRelatedMapper.selectByPrimaryKey(memberUnionidRelatedId);
-            dto.setUnionid(dto.getUnionid() == null ? memberUnionidRelated.getUnionid() : dto.getUnionid());
-            dto.setExternalUserid(dto.getExternalUserid() == null ? memberUnionidRelated.getExternalUserid() : dto.getExternalUserid());
-            dto.setSelfExternalUserid(dto.getSelfExternalUserid() == null ? memberUnionidRelated.getSelfExternalUserid() : dto.getSelfExternalUserid());
-            dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
+        MemberUnionidRelatedDTO midRelatedDto = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class);
+
+        if (midRelatedDto != null) {
+            dto.setUnionid(dto.getUnionid() == null ? midRelatedDto.getUnionid() : dto.getUnionid());
+            dto.setExternalUserid(dto.getExternalUserid() == null ? midRelatedDto.getExternalUserid() : dto.getExternalUserid());
+            dto.setSelfExternalUserid(dto.getSelfExternalUserid() == null ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid());
+            dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId());
+            dto.setAvatar(dto.getAvatar() == null ? midRelatedDto.getAvatar() : dto.getAvatar());
             memberUnionRelatedService.update(dto);
             RedisUtil.unlock(lockKey);
             return dto;
         } else {
-            memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
-            RedisUtil.setCache(key, memberUnionidRelatedId, 60L);
+            String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
+            dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
+            RedisUtil.setCache(key, JSONObject.toJSONString(dto), 60L);
             RedisUtil.unlock(lockKey);
             return null;
         }