Merge branch 'fixbug_0921' into developer

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

@@ -167,7 +167,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         wxUserAddLogService.save(wxUserAddLogQDTO);
 
         //定制
-        addDelFriendEvent(related.getUnionid(), related.getClerkId(),wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
     }
 
     /**
@@ -179,16 +179,26 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId,String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
         String addDelFriendEvent = config.getAddDelFriendEvent();
         if (!addDelFriendEvent.contains(wxEnterpriseId)) {
             logger.info("非定制，无需广播通知");
             return;
         }
+
+        if (StringUtils.isBlank(memberId)) {
+            logger.info("会员不存在:{}", memberId);
+            return;
+        }
+        logger.info("欧泊莱定制：推送会员,memberId:{},changeType:{}", memberId, changeType);
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
         MemberDTO member = memberService.getMember(memberId);
+        if (member == null) {
+            logger.info("会员不存在:{}", memberId);
+            return;
+        }
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             JSONObject msgBody = new JSONObject();
@@ -328,10 +338,10 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 
     @Override
     public void repairExternalUserId(String wxEnterpriseIds) {
-        logger.info("外部联系人检查,wxEnterpriseIds={}",wxEnterpriseIds);
-        DingUtils.send("外部联系人修复消息,企业="+wxEnterpriseIds+",tranceid="+ProviderLocalTag.tag.get().traceId, false);
-        if(StringUtils.isEmpty(wxEnterpriseIds)) {
-            return ;
+        logger.info("外部联系人检查,wxEnterpriseIds={}", wxEnterpriseIds);
+        DingUtils.send("外部联系人修复消息,企业=" + wxEnterpriseIds + ",tranceid=" + ProviderLocalTag.tag.get().traceId, false);
+        if (StringUtils.isEmpty(wxEnterpriseIds)) {
+            return;
         }
         Object cache = RedisUtil.getCache("repairExternalUserId");
         String[] arr = wxEnterpriseIds.split(",");
@@ -359,7 +369,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 List<String> externalUserIdList = new ArrayList<>();
                 externalUserIdList.addAll(externalUserIdSet);
                 List<MemberUnionidRelated> unionidlist = this.memberUnionidRelatedMapper.listByWxEnterpriseIdAndExternalUserId(wxEnterpriseId, externalUserIdList);
-                Map<String, String> map = unionidlist.stream().filter(dto->StringUtils.isNotBlank(dto.getExternalUserid()) && StringUtils.isNotBlank(dto.getSelfExternalUserid()))
+                Map<String, String> map = unionidlist.stream().filter(dto -> StringUtils.isNotBlank(dto.getExternalUserid()) && StringUtils.isNotBlank(dto.getSelfExternalUserid()))
                         .collect(Collectors.toMap(MemberUnionidRelated::getExternalUserid, MemberUnionidRelated::getSelfExternalUserid, (k1, k2) -> k1));
                 logger.info("外部联系人检查,第{}次,好友数={},unionid表数={}", pageNum, externalUserIdList.size(), unionidlist.size());
                 List<String> delList = new ArrayList<>();

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

@@ -135,6 +135,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public String bind(StaffClerkRelationDTO dto, String optStaffId, int channelCode) {
+        String staffId = dto.getStaffId();
+        TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
+        if (tabHaobanStaff == null) {
+            logger.error("员工不存在:{}",staffId);
+            return "";
+        }
         Date now = new Date();
         dto.setStaffClerkRelationId(ToolUtil.randomUUID());
         dto.setStatusFlag(1);
@@ -144,8 +150,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         int insert = mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto));
         String s = insert > 0 ? dto.getStaffClerkRelationId() : null;
         if (null != s) {
-            String staffId = dto.getStaffId();
-            TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
             String wxEnterpriseId = dto.getWxEnterpriseId();
             clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
             //推入日志

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

@@ -251,11 +251,20 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             return;
         }
 
-        log.info("欧泊莱定制：unionId:{},clerkId:{}", unionId, changeType);
+        if (StringUtils.isBlank(memberId)) {
+            log.info("会员不存在:{}", memberId);
+            return;
+        }
+        log.info("欧泊莱定制：推送会员,memberId：{},changeType:{}", memberId, changeType);
+
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
         MemberDTO member = memberService.getMember(memberId);
+        if (member == null) {
+            log.info("会员不存在:{}", memberId);
+            return;
+        }
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             JSONObject msgBody = new JSONObject();

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

@@ -200,6 +200,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 String wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
                 memberUnionidRelatedDTO.setWxEnterpriseId(wxEnterpriseId);
                 TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+                if (staff == null) {
+                    log.error("员工不存在：{}",wxUserId);
+                    return;
+                }
                 String staffId = staff.getStaffId();
                 memberUnionidRelatedDTO.setStaffId(staffId);
                 List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = externalClerkRelatedService.listByExternalUseridAndWxUserId(memberUnionidRelatedDTO.getExternalUserid(), memberUnionidRelatedDTO.getStaffId());
@@ -221,7 +225,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 wxUserAddLogQDTO.setClerkId(related.getClerkId());
                 wxUserAddLogQDTO.setDelClerkFlag(true);
                 wxUserAddLogService.save(wxUserAddLogQDTO);
-                addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId,enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+                addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
                 return;
             }
             log.info("导购删除好友");
@@ -643,7 +647,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
 
         //定制事件订阅
-        addDelFriendEvent(unionId, clerkId,wxEnterpriseId, enterpriseId, memberId, storeId, 1);
+        addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1);
         return memberId;
     }
 
@@ -656,18 +660,26 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param memberId
      * @param storeId
      */
-    private void addDelFriendEvent(String unionId, String clerkId,String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
         String addDelFriendEvent = config.getAddDelFriendEvent();
         if (!addDelFriendEvent.contains(wxEnterpriseId)) {
             log.info("非定制，无需广播通知");
             return;
         }
 
-        log.info("欧泊莱定制：unionId:{},clerkId:{}",unionId,changeType);
+        if (StringUtils.isBlank(memberId)) {
+            log.info("会员不存在:{}", memberId);
+            return;
+        }
+        log.info("欧泊莱定制：推送会员,memberId：{},changeType:{}", memberId, changeType);
         //欧泊莱定制需求
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         StoreDTO storeDTO = storeService.getStore(storeId);
         MemberDTO member = memberService.getMember(memberId);
+        if (member == null) {
+            log.info("会员不存在:{}", memberId);
+            return;
+        }
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             JSONObject msgBody = new JSONObject();
@@ -1017,7 +1029,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @return
      */
     public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto, String wxUserId) {
-        log.info("【新增外部联系人回调】dto={},wxUserId={}", JSON.toJSONString(dto),wxUserId);
+        log.info("【新增外部联系人回调】dto={},wxUserId={}", JSON.toJSONString(dto), wxUserId);
         String corpId = dto.getCorpid();
         TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId, null);
         if (tabHaobanWxApplication == null) {
@@ -2003,7 +2015,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public void addDelFriendEventTest(String param) {
-        log.info("addDelFriendEventTest：{}",param);
+        log.info("addDelFriendEventTest：{}", param);
     }
 
     /**