Merge remote-tracking branch 'origin/feature/五月需求迭代' into feature/五月需求迭代

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

@@ -735,6 +735,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
         this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+        this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
         //定制事件订阅
         addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1);
         return memberId;

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

@@ -186,7 +186,8 @@ public class StaffApiServiceImpl implements StaffApiService {
         List<String> relationIdList = this.staffClerkRelationService.listRelationsStaffId(staffIdList);
         //已关联的成员需要查询关联的品牌名称
         List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
-        Map<String, String> map = list.stream().collect(Collectors.toMap(TabHaobanWxEnterpriseRelated::getEnterpriseId, TabHaobanWxEnterpriseRelated::getEnterpriseName));
+        //解决空指针异常问题
+        Map<String, Object> map = list.stream().collect(Collectors.toMap(TabHaobanWxEnterpriseRelated::getEnterpriseId, a->Optional.ofNullable(a.getEnterpriseName())));
         List<StaffClerkRelationDTO> relationDTOList = staffClerkRelationService.listByWxEnterpriseIdAndStaffId(wxEnterpriseId, staffIdList);
         staffDTOList.forEach(one -> {
             if(relationIdList.contains(one.getStaffId())){
@@ -195,7 +196,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                 List<String> enterpriseNameList = new ArrayList<>(8);
                 for (StaffClerkRelationDTO dto : relationDTOList){
                     if (dto.getStaffId().equals(one.getStaffId())){
-                        enterpriseNameList.add(map.get(dto.getEnterpriseId()));
+                        enterpriseNameList.add(String.valueOf(map.get(dto.getEnterpriseId())));
                     }
                 }
                 if (CollUtil.isNotEmpty(enterpriseNameList)){