Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -118,6 +118,11 @@ namespace Mall.Model.Extend.User
     /// </summary>
     public class AuthItem
     { 
+        /// <summary>
+        /// 是否选中，前台使用
+        /// </summary>
+        public bool IsChecked { get; set; }
+
         /// <summary>
         /// 起点X坐标
         /// </summary>

Mall.Module.User/UserModule.cs

@@ -177,6 +177,16 @@ namespace Mall.Module.User
             return member_UserRepository.GetEntity(userId).RefMapperTo<RB_Member_User_Extend>();
         }
 
+        /// <summary>
+        /// 根据条件获取用户实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Member_User_Extend GetMemberUserEntityModule(RB_Member_User_Extend query)
+        {
+            return member_UserRepository.GetMemberUserEntityRepository(query);
+        }
+
         /// <summary>
         /// 新增用户
         /// </summary>
@@ -197,29 +207,19 @@ namespace Mall.Module.User
         /// <returns></returns>
         public bool ValidateUserOpenId(string openId, Common.Enum.User.UserSourceEnum? source, int tenantId, int mallBaseId)
         {
-            List<WhereHelper> wheres = new List<WhereHelper>() {
-                new WhereHelper(){
-                    FiledName=nameof(RB_Member_User.Source),
-                     FiledValue=(int)source,
-                      OperatorEnum=OperatorEnum.Equal
-                },
-                new WhereHelper(){
-                    FiledName=nameof(RB_Member_User.OpenId),
-                     FiledValue=openId,
-                      OperatorEnum=OperatorEnum.Equal
-                },
-                new WhereHelper(){
-                    FiledName=nameof(RB_Member_User.TenantId),
-                     FiledValue=tenantId,
-                      OperatorEnum=OperatorEnum.Equal
-                },
-                new WhereHelper(){
-                    FiledName=nameof(RB_Member_User.MallBaseId),
-                     FiledValue=mallBaseId,
-                      OperatorEnum=OperatorEnum.Equal
-                },
-            };
-            return member_UserRepository.Exists(wheres);
+            var flag = false;
+            var model = member_UserRepository.GetMemberUserEntityRepository(new RB_Member_User_Extend()
+            {
+                OpenId = openId,
+                TenantId = tenantId,
+                MallBaseId = mallBaseId,
+                Source = source
+            });
+            if (model != null && model.Id > 0)
+            {
+                flag = true;
+            }
+            return flag;
         }
 
         /// <summary>

Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs

@@ -162,6 +162,10 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
             {
                 where += $" and oas.{nameof(RB_Goods_OrderAfterSale.OrderDetialId)}={dmodel.OrderDetialId}";
             }
+            if (dmodel.Type > 0) 
+            {
+                where += $" and oas.{nameof(RB_Goods_OrderAfterSale.Type)}={dmodel.Type}";
+            }
             if (!string.IsNullOrEmpty(dmodel.ReOrderNo))
             {
                 where += $" and oas.{nameof(RB_Goods_OrderAfterSale.ReOrderNo)} like '%{dmodel.ReOrderNo}%'";

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -150,7 +150,7 @@ namespace Mall.WebApi.Controllers.User
             }
             else {
                 //查询用户信息
-                var umodel = userModule.GetMemberUserPageList(1, 1, out _, new RB_Member_User_Extend() { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, Source = demodel.Source, OpenId = demodel.OpenId }).FirstOrDefault();
+                var umodel = userModule.GetMemberUserEntityModule(new RB_Member_User_Extend() { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, Source = demodel.Source, OpenId = demodel.OpenId });
                 if (umodel == null) {
                     return ApiResult.Failed("未能查询到用户信息");
                 }