Fix Mapping Hidden Base member

Author: DocSvartz

src/Mapster.Tests/WhenMappingInitProperty.cs

@@ -19,7 +19,7 @@ public void WhenMappingToHiddenandNewInitFieldDestination()
         var c =  source.Adapt<BDestination>(); 
         var s = source.Adapt(new BDestination());
 
-        ((ADestination)c).Id.ShouldBe(156);
+        ((ADestination)c).Id.ShouldBe(default); // Hidden Base member is not mapping
         s.Id.ShouldBe(156);
     }
 
@@ -33,7 +33,7 @@ public void WhenMappingToHiddenandNewInitFieldWithConstructUsing()
         var c = source.Adapt<BDestination>();
         var s = source.Adapt(new BDestination());
 
-        ((ADestination)c).Id.ShouldBe(256);
+        ((ADestination)c).Id.ShouldBe(default); // Hidden Base member is not mapping
         s.Id.ShouldBe(256);
     }
 

src/Mapster/Utils/ReflectionUtils.cs

@@ -75,23 +75,44 @@ public static IEnumerable<IMemberModelEx> GetFieldsAndProperties(this Type type,
             var bindingFlags = BindingFlags.Instance | BindingFlags.Public;
             if (includeNonPublic)
                 bindingFlags |= BindingFlags.NonPublic;
-            
+
+            var currentTypeMembers = type.FindMembers(MemberTypes.Property | MemberTypes.Field,
+                 BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
+                 (x, y) => true, type.FullName);
+
             if (type.GetTypeInfo().IsInterface)
             {
                 var allInterfaces = GetAllInterfaces(type);
-                return allInterfaces.SelectMany(GetPropertiesFunc);
+                return allInterfaces.SelectMany(x => GetPropertiesFunc(x, currentTypeMembers));
             }
 
-            return GetPropertiesFunc(type).Concat(GetFieldsFunc(type));
+            return GetPropertiesFunc(type, currentTypeMembers).Concat(GetFieldsFunc(type, currentTypeMembers));
 
-            IEnumerable<IMemberModelEx> GetPropertiesFunc(Type t) => t.GetProperties(bindingFlags)
-                .Where(x => x.GetIndexParameters().Length == 0)
+            IEnumerable<IMemberModelEx> GetPropertiesFunc(Type t, MemberInfo[] currentTypeMembers) => t.GetProperties(bindingFlags)
+                .Where(x => x.GetIndexParameters().Length == 0).DropHiddenMembers(currentTypeMembers)
                 .Select(CreateModel);
 
-            IEnumerable<IMemberModelEx> GetFieldsFunc(Type t) => t.GetFields(bindingFlags)
+            IEnumerable<IMemberModelEx> GetFieldsFunc(Type t, MemberInfo[] overlapMembers) =>
+                t.GetFields(bindingFlags).DropHiddenMembers(overlapMembers)
                 .Select(CreateModel);
         }
 
+        public static IEnumerable<T> DropHiddenMembers<T>(this IEnumerable<T> allMembers, ICollection<MemberInfo> currentTypeMembers) where T : MemberInfo
+        {
+            var compareMemberNames = allMembers.IntersectBy(currentTypeMembers.Select(x => x.Name), x => x.Name).Select(x => x.Name);
+
+            foreach (var member in allMembers)
+            {
+                if (compareMemberNames.Contains(member.Name))
+                {
+                    if (currentTypeMembers.First(x => x.Name == member.Name).MetadataToken == member.MetadataToken)
+                        yield return member;
+                }
+                else
+                    yield return member;
+            }
+        }
+
         // GetProperties(), GetFields(), GetMethods() do not return properties/methods from parent interfaces,
         // so we need to process every one of them separately.
         public static IEnumerable<Type> GetAllInterfaces(this Type interfaceType)