好友批处理 优化

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalUserDTO.java

@@ -29,6 +29,19 @@ public class ExternalUserDTO implements Serializable{
 	private String staffId;
 
 	private String selfExternalUserId;
+    /**
+     * 好友类型
+     * 1表示该外部联系人是微信用户，2表示该外部联系人是企业微信用户
+     */
+    private Integer friendType;
+
+    public Integer getFriendType() {
+        return friendType;
+    }
+
+    public void setFriendType(Integer friendType) {
+        this.friendType = friendType;
+    }
 
 	public String getSelfExternalUserId() {
 		return selfExternalUserId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ExternalUserPojo.java

@@ -15,6 +15,19 @@ public class ExternalUserPojo implements Serializable{
 	private String addCreateTime;
 	
 	private String externalUserId;
+	/**
+	 * 好友类型
+	 * 1表示该外部联系人是微信用户，2表示该外部联系人是企业微信用户
+	 */
+	private Integer friendType;
+
+	public Integer getFriendType() {
+		return friendType;
+	}
+
+	public void setFriendType(Integer friendType) {
+		this.friendType = friendType;
+	}
 
 	public String getWxEnterpriseId() {
 		return wxEnterpriseId;

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

@@ -66,7 +66,8 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
 		TabHaobanWxEnterprise enterprise = new TabHaobanWxEnterprise();
 		enterprise.setWxEnterpriseId(wxEnterpriseId);
 		enterprise.setStatusFlag(0);
-		return this.mapper.updateByPrimaryKeySelective(enterprise);
+        enterprise.setUpdateTime(new Date());
+        return this.mapper.updateByPrimaryKeySelective(enterprise);
 	}
 
 	@Override

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

@@ -1335,6 +1335,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		String name = "";
 		String createTime = "";
 		String avatar = "";
+		Integer friendType = 1;
 		if(StringUtils.isNotBlank(uJ)){
 			JSONObject jo = JSON.parseObject(uJ);
 			String external_contact  = jo.getString("external_contact");
@@ -1343,6 +1344,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			if(StringUtils.isNotBlank(external_contact)){
 				jt = JSON.parseObject(external_contact);
 				name = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
+				friendType = jt.getInteger("type");
 				if(StringUtils.isBlank(name)){
 					name = "--";
 				}
@@ -1371,6 +1373,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		pojo.setAddCreateTime(createTime);
 		pojo.setWxEnterpriseId(wxEnterpriseId);
 		pojo.setAvatar(avatar);
+		pojo.setFriendType(friendType);
 		return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
 	}
 	@Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -165,6 +165,9 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         String wxUserId = dataPre.getpDataId();
         String taskId = dataPre.getTaskId();
 
+        if (externalUserDTO.getFriendType() == 2) {
+            return "不是微信好友，是企业微信好友:" + externalUserDTO.getFriendType();
+        }
         //staff信息
         StaffDTO staff = staffApiService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         if (staff == null) {
@@ -219,7 +222,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
                     externalUserDTO.getUnionId(), "", externalUserDTO.getName(), externalUserDTO.getAvatar(), qrcodeParam);
         }
         if (member == null) {
-            return "会员不存在:" + externalUserDTO.getUnionId();
+            return "会员不存在:unionid:" + externalUserDTO.getUnionId();
         }
         externalUserDTO.setMemberId(member.getMemberId());
         return memberUnionidRelatedApiService.addExternal(externalUserDTO);

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

@@ -51,13 +51,15 @@ public class GicDepartmentController extends WebBaseController{
 		Map<String, StoreRangeInfoDTO> storeRangeMap = new HashMap<>();
 		if (CollectionUtils.isNotEmpty(rangeInfoDTOList)) {
 			List<WxEnterpriseDTO> wxEnterpriseDTOS = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(enterpriseId);
-			Map<String, WxEnterpriseDTO> wxEnterpriseDTOMap = wxEnterpriseDTOS.stream().collect(Collectors.toMap(dto -> dto.getWxEnterpriseId(), dto -> dto));
+			if (CollectionUtils.isNotEmpty(wxEnterpriseDTOS)) {
+				Map<String, WxEnterpriseDTO> wxEnterpriseDTOMap = wxEnterpriseDTOS.stream().collect(Collectors.toMap(dto -> dto.getWxEnterpriseId(), dto -> dto));
 
-			storeRangeMap = rangeInfoDTOList.stream().filter(dto -> (!dto.getWxEnterpriseId().equals(wxEnterpriseId)) && dto.getRelationType() == 1)
-					.map(dto -> {
-						dto.setWxEnterpriseName(wxEnterpriseDTOMap.get(dto.getWxEnterpriseId()).getCorpName());
-						return dto;
-					}).collect(Collectors.toMap(dto -> dto.getRelationId(), dto -> dto));
+				storeRangeMap = rangeInfoDTOList.stream().filter(dto -> (!dto.getWxEnterpriseId().equals(wxEnterpriseId)) && dto.getRelationType() == 1)
+						.map(dto -> {
+							dto.setWxEnterpriseName(wxEnterpriseDTOMap.get(dto.getWxEnterpriseId()).getCorpName());
+							return dto;
+						}).collect(Collectors.toMap(dto -> dto.getRelationId(), dto -> dto));
+			}
 		}
 		Map<String, StoreRangeInfoDTO> finalStoreRangeMap = storeRangeMap;
 		List<StoreGroupVo> ret = departmentList.stream().map(dto -> {