Merge branch 'master' into developer

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

@@ -721,11 +721,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //校验friend
         String userId = dto.getWxUserId();
         String suiteid = dto.getSuiteid();
+        String externalUserid = dto.getExternalUserid();
         ExternalUserDTO externalUserDTO;
         if (SELF_APP.equals(suiteid)) {
-            externalUserDTO = this.getCorpSelfExternalUseridInfo(wxEnterpriseId, userId, dto.getExternalUserid());
+            externalUserDTO = this.getCorpSelfExternalUseridInfo(wxEnterpriseId, userId, externalUserid);
         } else {
-            externalUserDTO = this.getExternalUseridInfo(wxEnterpriseId, userId, dto.getExternalUserid());
+            externalUserDTO = this.getExternalUseridInfo(wxEnterpriseId, userId, externalUserid);
         }
         checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, externalUserDTO, dto);
         if (externalUserDTO == null) {
@@ -751,18 +752,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
         MemberUnionidRelatedDTO midRelatedDto = RedisUtil.getCache(key, MemberUnionidRelatedDTO.class);
         if (midRelatedDto == null) {
+            log.info("redis缓存中无该好友数据,插入数据：{}", JSON.toJSONString(dto));
             String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
             dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
             RedisUtil.setCache(key, dto, 180L);
             RedisUtil.unlock(lockKey);
             return 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());
+        log.info("好办和好办助手均已回调：{}", JSON.toJSONString(dto));
+        dto.setUnionid(StringUtils.isBlank(dto.getUnionid()) ? midRelatedDto.getUnionid() : dto.getUnionid());
+        dto.setExternalUserid(StringUtils.isBlank(dto.getExternalUserid()) ? midRelatedDto.getExternalUserid() : externalUserid);
+        dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid());
+        dto.setAvatar(StringUtils.isBlank(dto.getAvatar()) ? midRelatedDto.getAvatar() : dto.getAvatar());
         dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId());
-        dto.setAvatar(dto.getAvatar() == null ? midRelatedDto.getAvatar() : dto.getAvatar());
         List<MemberUnionidRelatedDTO> relatedDTOS = memberUnionRelatedService.listBySelfExternalUserId(dto.getWxUserId(), dto.getWxEnterpriseId(), dto.getSelfExternalUserid());
         //老的关联需要删除
         if (CollectionUtils.isNotEmpty(relatedDTOS)) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -131,7 +131,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
             WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
             wellDoneLoginInfoVo.setWxOpenUseId(userId);
             StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
-            wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+            //wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+            wellDoneLoginInfoVo.setPrivacyUseFlag(1);
             wellDoneLoginInfoVo.setStaffId("-1");
             return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }
@@ -178,7 +179,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         wellDoneLoginInfoVo.setNationcode(loginStaff.getNationCode());
         wellDoneLoginInfoVo.setWxUserId(loginStaff.getWxUserId());
         StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
-        wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+        //wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+        wellDoneLoginInfoVo.setPrivacyUseFlag(1);
         return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
     }