Merge remote-tracking branch 'origin/developer' into developer

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

@@ -166,15 +166,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 			log.info("memberStoreIdList===============>{}",JSONObject.toJSONString(memberStoreIdList));
 			log.info("storeIds===============>{}",JSONObject.toJSONString(storeIds));
-			//取交集
-			memberStoreIdList.retainAll(storeIds);
-			if(CollectionUtil.isEmpty(memberStoreIdList)){
+			//取交集(解决不支持的报错现象)
+			List list3= new ArrayList(memberStoreIdList);
+			List list4= new ArrayList(storeIds);
+			list3.retainAll(list4);
+			if(CollectionUtil.isEmpty(list3)){
 				continue;
 			}else{
-				for(String resultStoreId : memberStoreIdList){
+				for(Object resultStoreId : list3){
 					MemberStoreDTO dto = new MemberStoreDTO();
 					dto.setMemberId(memberId);
-					dto.setStoreId(resultStoreId);
+					dto.setStoreId(resultStoreId.toString());
 					result.add(dto);
 				}