feat：增加打印日志

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

@@ -70,8 +70,10 @@ public interface ExternalClerkRelatedApiService {
 
     /**
      * 推送外部联系人 更新次数以及状态
-     *
      * @param relationKey
+     * @param enterpriseId
+     * @param memberId
+     * @param unionid
      * @return
      */
     ServiceResponse<ExternalClerkRelatedDTO> bindMemberIdExternalByRelationKey(String relationKey, String enterpriseId, String memberId, String unionid);

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

@@ -136,6 +136,10 @@ public interface MemberUnionidRelatedApiService {
 	 */
 	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
+	/**
+	 * 刷新企微好友
+	 * @param res
+	 */
 	void mqFreshWxFrend(String res);
 
 	void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String resWes);

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

@@ -151,11 +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);
             resp.setCode(0);
             resp.setMessage("relationKey对应的关联关系不存在或删除");
             return resp;
         }
         if (!externalClerkRelated.getEnterpriseId().equals(enterpriseId)) {
+            log.error("relationKey对应的企业与所传会员企业不对应：relationKey:{},memberId:{},unionid:{}",relationKey,memberId,unionid);
             resp.setCode(0);
             resp.setMessage("relationKey对应的企业与所传会员企业不对应");
             return resp;
@@ -165,9 +167,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         externalClerkRelated.setUpdateTime(new Date());
         externalClerkRelated.setStatusFlag(1);
         tabHaobanExternalClerkRelatedMapper.updateByPrimaryKeySelective(externalClerkRelated);
+
         //更新unionid
         MemberUnionidRelated memberUnionidRelated = memberUnionidRelatedMapper.selectByPrimaryKey(externalClerkRelated.getMemberUnionidRelatedId());
+        memberUnionidRelated.setMemberId(memberId);
         memberUnionidRelated.setUnionid(unionid);
+        memberUnionidRelated.setEnterpriseId(enterpriseId);
         memberUnionidRelated.setUpdateTime(new Date());
         memberUnionidRelatedMapper.updateByPrimaryKeySelective(memberUnionidRelated);
 

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

@@ -284,13 +284,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String staffId = staff.getStaffId();
 
         MemberDTO member = null;
-        TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
-        if (r == null) {
+        TabHaobanClerkMainStoreRelated mainStoreByStaffId = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+        if (mainStoreByStaffId == null) {
             log.info("【新增外部联系人】主门店为空");
             return;
         }
-        String storeId = r.getStoreId();
-
+        String storeId = mainStoreByStaffId.getStoreId();
         StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, storeId);
         if (staffClerkRelationDTO == null) {
             log.info("【新增外部联系人】导购和clerk关联为空");
@@ -310,7 +309,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
             qrcodeParam = clerk.getQrcodeParam();
         }
-        if (clerk != null && StringUtils.isNotBlank(qrcodeParam) && StringUtils.isNotBlank(unionId)) {
+        if (StringUtils.isNotBlank(qrcodeParam) && StringUtils.isNotBlank(unionId)) {
             log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", staffClerkRelationDTO.getEnterpriseId(), unionId, name, avatar, qrcodeParam);
             member = memberOpenCardBusinessService.getMemberByQywxChannelParam(staffClerkRelationDTO.getEnterpriseId(), unionId, "", name, avatar, qrcodeParam);
         }
@@ -639,94 +638,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         sendWelcome(dto, staffClerkRelationDTO, true);
     }
 
-    @Deprecated
-    private String insertMemberUnionIdRelated(MemberUnionidRelatedDTO dto) {
-        if (dto == null) {
-            return "";
-        }
-        String wxUserId = dto.getWxUserId();
-        String wxEnterpriseId = dto.getWxEnterpriseId();
-        String name = dto.getExternalName();
-        String createTime = dto.getAddCreateTime();
-        if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime)) {
-            log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={}", wxUserId, wxEnterpriseId, name, createTime);
-            return "";
-        }
-        MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(wxUserId, wxEnterpriseId, name, createTime);
-        String uuid = "";
-        if (exsitDTO == null) {
-            uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
-        } else {
-            //如果是自建更新uuid
-            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserid());
-            exsitDTO.setUnionid(dto.getUnionid());
-            //更新对外联系人id
-            exsitDTO.setExternalUserid(dto.getExternalUserid());
-            memberUnionRelatedService.update(exsitDTO);
-            uuid = exsitDTO.getMemberUnionidRelatedId();
-
-            MemberUnionidRelatedDTO fullDTO = memberUnionRelatedService.getByParams(wxUserId, wxEnterpriseId, name, createTime);
-            dto.setExternalUserid(fullDTO.getExternalUserid());
-            dto.setUnionid(fullDTO.getUnionid());
-        }
-        return uuid;
-    }
-
-    @Deprecated
-    private MemberUnionidRelatedDTO getMemberUnionidRelatedDTO(MemberUnionidRelatedDTO dto) {
-        log.info("【新增外部联系人回调】dto={}", JSON.toJSONString(dto));
-        String corpId = dto.getCorpid();
-        TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(corpId);
-        if (wxEnterprise == null) {
-            return null;
-        }
-
-        String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
-        String userId = dto.getWxUserId();
-        String suiteid = dto.getSuiteid();
-        String unionIdJson = "";
-        if (SELF_APP.equals(suiteid)) {
-            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
-            if (null == secretSetting) {
-                log.info("没有配置secret");
-                return null;
-            }
-            unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), secretSetting.getSecretVal(), dto.getExternalUserid());
-        } else {
-            unionIdJson = qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
-        }
-
-        if (StringUtils.isBlank(unionIdJson)) {
-            log.info("【新增外部联系人回调】unionIdJson=null");
-            return null;
-        }
-        log.info("【新增外部联系人回调】unionIdJson={}", JSON.toJSONString(unionIdJson));
-
-        ExternalUserPojo pojo = getExternalUserPojo(unionIdJson, userId, wxEnterpriseId);
-        String name = pojo.getName();
-        String createTime = pojo.getAddCreateTime();
-
-        dto.setWxEnterpriseId(wxEnterpriseId);
-
-        dto.setExternalName(name);
-        dto.setAddCreateTime(createTime);
-        dto.setAvatar(pojo.getAvatar());
-
-        String externalUserId = null;
-        String selfExternalUserId = null;
-        String unionId = null;
-        if (SELF_APP.equals(suiteid)) {
-            unionId = pojo.getUnionId();
-            selfExternalUserId = dto.getExternalUserid();
-        } else {
-            externalUserId = dto.getExternalUserid();
-        }
-        dto.setUnionid(unionId);
-        dto.setSelfExternalUserid(selfExternalUserId);
-        dto.setExternalUserid(externalUserId);
-        return dto;
-    }
-
     /**
      * 组装数据
      *

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

@@ -150,7 +150,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (loginStaff.getActiveFlag() == 0) {
             staffApiService.activeStaff(staffId);
         }
-        StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
+
 
         String wxEnterpriseId = loginStaff.getWxEnterpriseId();
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
@@ -164,6 +164,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         wellDoneLoginInfoVo.setNationcode(loginStaff.getNationCode());
         wellDoneLoginInfoVo.setWxUserId(loginStaff.getWxUserId());
         wellDoneLoginInfoVo.setPrivacyUseFlag(1);
+        //StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
         //if (staffPrivacyUseLogDTO != null) {
         //    wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO.getPrivacyUseFlag());
         //}
@@ -456,7 +457,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (StringUtils.isAnyBlank(memberId, enterpriseId, relationKey)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        logger.info("会员绑定好友，memberId:{},enterpriseId:{},unionid:{},relationKey:{}", enterpriseId, memberId, unionid, relationKey);
+        logger.info("会员绑定好友，memberId:{},enterpriseId:{},unionid:{},relationKey:{}", memberId, enterpriseId, unionid, relationKey);
         memberOpenCardBusinessService.memberClerkProcessByQywxFriend(enterpriseId, memberId, unionid, relationKey);
         return resultResponse(HaoBanErrCode.ERR_1);
     }