分销基础

Mall.Common/Enum/User/DistrbutorWithdrawWayEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 分销商提现方式枚举
+    /// </summary>
+    public enum DistrbutorWithdrawWayEnum
+    {
+        /// <summary>
+        /// 自动打款
+        /// </summary>
+        [EnumField("自动打款")]
+        ZDDK = 1,
+        /// <summary>
+        /// 微信线下转账
+        /// </summary>
+        [EnumField("微信线下转账")]
+        WXZZ = 2,
+        /// <summary>
+        /// 支付宝线下转账
+        /// </summary>
+        [EnumField("支付宝线下转账")]
+        ZFBZZ = 3,
+        /// <summary>
+        /// 银行卡线下转账
+        /// </summary>
+        [EnumField("银行卡线下转账")]
+        YYKZZ = 4,
+        /// <summary>
+        /// 余额提现
+        /// </summary>
+        [EnumField("余额提现")]
+        YETX = 5,
+    }
+}

Mall.Common/Enum/User/DistributorApplyForEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 用户下线枚举
+    /// </summary>
+    public enum DistributorApplyForEnum
+    {
+        /// <summary>
+        /// 申请（填信息）需审核
+        /// </summary>
+        [EnumField("申请（填信息）需审核")]
+        TX = 1,
+        /// <summary>
+        /// 申请（填信息）无需审核
+        /// </summary>
+        [EnumField("申请（填信息）无需审核")]
+        TWX = 2,
+        /// <summary>
+        /// 申请（不填信息）需审核
+        /// </summary>
+        [EnumField("申请（不填信息）需审核")]
+        BTX = 3,
+        /// <summary>
+        /// 申请（不填信息）无需审核
+        /// </summary>
+        [EnumField("申请（不填信息）无需审核")]
+        BTWX = 4
+    }
+}

Mall.Common/Enum/User/DistributorConditionEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 成为分销商条件枚举
+    /// </summary>
+    public enum DistributorConditionEnum
+    {
+        /// <summary>
+        /// 单次消费
+        /// </summary>
+        [EnumField("单次消费")]
+        DCXF = 1,
+        /// <summary>
+        /// 购买商品
+        /// </summary>
+        [EnumField("购买商品")]
+        GMSP = 2,
+        /// <summary>
+        /// 无条件
+        /// </summary>
+        [EnumField("无条件")]
+        WTJ = 3
+    }
+}

Mall.Common/Enum/User/UserReferralsEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 用户下线枚举
+    /// </summary>
+    public enum UserReferralsEnum
+    {
+        /// <summary>
+        /// 首次点击链接
+        /// </summary>
+        [EnumField("首次点击链接")]
+        SCDJ = 1,
+        /// <summary>
+        /// 首次下单
+        /// </summary>
+        [EnumField("首次下单")]
+        SCXD = 2,
+        /// <summary>
+        /// 首次付款
+        /// </summary>
+        [EnumField("首次付款")]
+        SCFK = 3
+    }
+}

Mall.Model/Entity/Product/RB_Material_Group.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 素材管理表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Material_Group
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分组名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型  1图片  2视频
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态 
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 回收  1正常  2回收
+        /// </summary>
+        public int? Recycled { get; set; }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Material_Info.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 素材管理表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Material_Info
+    {
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 素材名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型  1图片  2视频
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分组ID  0表示全部
+        /// </summary>        
+        public int? GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 存放路径
+        /// </summary>        
+        public string Path
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 视频封面图
+        /// </summary>        
+        public string Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 视频时长  秒
+        /// </summary>        
+        public int? VideoTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 视频的宽高
+        /// </summary>        
+        public string WithHeight
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 回收  1正常  2回收
+        /// </summary>
+        public int? Recycled { get; set; }
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int? Status { get; set; }
+    }
+}

Mall.Model/Entity/User/RB_Distributor_Basics.cs

@@ -41,7 +41,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 下线条件  枚举
         /// </summary>        
-        public int? ReferralsCondition
+        public UserReferralsEnum? ReferralsCondition
         {
             get;
             set;
@@ -49,7 +49,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 申请成为分销商  枚举
         /// </summary>        
-        public int? ApplyFor
+        public DistributorApplyForEnum? ApplyFor
         {
             get;
             set;
@@ -57,7 +57,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 成为分销商的条件 枚举
         /// </summary>        
-        public int? DistributorCondition
+        public DistributorConditionEnum? DistributorCondition
         {
             get;
             set;
@@ -103,9 +103,13 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
+        /// 分销商等级入口图片
+        /// </summary>
+        public string GradeEntranceimage { get; set; }
+        /// <summary>
         /// 提现方式  枚举
         /// </summary>        
-        public int? WithdrawWay
+        public DistrbutorWithdrawWayEnum? WithdrawWay
         {
             get;
             set;
@@ -153,7 +157,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 待审核页面背景图片
         /// </summary>        
-        public string BackgroundImage
+        public int? BackgroundImage
         {
             get;
             set;
@@ -161,7 +165,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 首页背景图片
         /// </summary>        
-        public string IndexImage
+        public int? IndexImage
         {
             get;
             set;
@@ -169,12 +173,16 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 商户号
         /// </summary>        
-        public int? TenantId
+        public int TenantId
         {
             get;
             set;
         }
         /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+        /// <summary>
         /// 创建时间
         /// </summary>        
         public DateTime? CreateDate

Mall.Model/Entity/User/RB_Member_Balance.cs

@@ -45,7 +45,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// Image
         /// </summary>        
-        public string Image
+        public int? Image
         {
             get;
             set;

Mall.Model/Entity/User/RB_Member_Equity.cs

@@ -41,7 +41,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 图片
         /// </summary>        
-        public string Image
+        public int? Image
         {
             get;
             set;

Mall.Model/Entity/User/RB_Member_Grade.cs

@@ -62,7 +62,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 会员图标
         /// </summary>        
-        public string Icon
+        public int? Icon
         {
             get;
             set;
@@ -70,7 +70,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 会员背景图片
         /// </summary>        
-        public string BackgroundImage
+        public int? BackgroundImage
         {
             get;
             set;

Mall.Model/Entity/User/RB_Member_Integral.cs

@@ -45,7 +45,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// Image
         /// </summary>        
-        public string Image
+        public int? Image
         {
             get;
             set;

Mall.Model/Extend/Product/RB_Material_Group_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 素材管理表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Material_Group_Extend : RB_Material_Group
+    {
+        /// <summary>
+        /// 分组ids
+        /// </summary>
+        public string GroupIds { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Material_Info_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 素材管理表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Material_Info_Extend : RB_Material_Info
+    {
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string MaterialIds { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_Distributor_Basics_Extend.cs

@@ -13,6 +13,13 @@ namespace Mall.Model.Extend.User
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Distributor_Basics_Extend : RB_Distributor_Basics
     {
-
+        /// <summary>
+        /// 路径
+        /// </summary>
+        public string IndexImagePath { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        public string BackgroundImagePath { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Member_Equity_Extend.cs

@@ -17,5 +17,9 @@ namespace Mall.Model.Extend.User
         /// 等级ids
         /// </summary>
         public string GradeIds { get; set; }
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string ImagePath { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Member_Grade_Extend.cs

@@ -21,5 +21,14 @@ namespace Mall.Model.Extend.User
         /// 权益列表
         /// </summary>
         public List<RB_Member_Equity_Extend> EquityList { get; set; }
+
+        /// <summary>
+        /// 图标路径
+        /// </summary>
+        public string IconPath { get; set; }
+        /// <summary>
+        /// 背景路径
+        /// </summary>
+        public string BackgroundImagePath { get; set; }
     }
 }

Mall.Module.Product/Mall.Module.Product.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
+    <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
+    <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

Mall.Module.Product/ProductModule.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common;
+using Mall.Common.API;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using Mall.Repository;
+using Mall.Repository.Product;
+
+namespace Mall.Module.Product
+{
+    /// <summary>
+    /// 商品处理层
+    /// </summary>
+    public class ProductModule
+    {
+        /// <summary>
+        /// 素材分组
+        /// </summary>
+        private readonly RB_Material_GroupRepository material_GroupRepository = new RB_Material_GroupRepository();
+        /// <summary>
+        /// 素材管理
+        /// </summary>
+        private readonly RB_Material_InfoRepository material_InfoRepository = new RB_Material_InfoRepository();
+
+
+        /// <summary>
+        /// 获取素材分组列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Material_Group_Extend> GetMaterialGroupList(RB_Material_Group_Extend dmodel) {
+            var list= material_GroupRepository.GetList(dmodel);
+            return list;
+        }
+
+
+        /// <summary>
+        /// 获取素材分组分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Material_Info_Extend> GetMaterialInfoPageList(int pageIndex, int pageSize, out long count, RB_Material_Info_Extend dmodel)
+        {
+            var list = material_InfoRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
+            return list;
+        }
+
+        /// <summary>
+        /// 新增分组
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetMaterialGroupInfo(RB_Material_Group_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Material_Group.Name),demodel.Name},
+                    { nameof(RB_Material_Group.Sort),demodel.Sort},
+                    { nameof(RB_Material_Group.UpdateDate),demodel.UpdateDate},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                     FiledName=nameof(RB_Material_Group.Id),
+                      FiledValue=demodel.Id,
+                       OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return material_GroupRepository.Update(keyValues, wheres);
+            }
+            else {
+                return material_GroupRepository.Insert(demodel) > 0;
+            }
+        }
+
+        /// <summary>
+        /// 设置素材信息
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetMaterialInfo(RB_Material_Info_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Material_Info.Name),demodel.Name},
+                    { nameof(RB_Material_Info.UpdateDate),demodel.UpdateDate},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                     FiledName=nameof(RB_Material_Group.Id),
+                      FiledValue=demodel.Id,
+                       OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return material_InfoRepository.Update(keyValues, wheres);
+            }
+            else {
+                return material_InfoRepository.Insert(demodel) > 0;
+            }
+        }
+
+        /// <summary>
+        /// 设置分组回收
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialGroupRecycled(int groupId, string uid, int mallBaseId)
+        {
+            var gmodel = material_GroupRepository.GetEntity(groupId);
+            if (gmodel == null) {
+                return false;
+            }
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Material_Group.Recycled),2},
+                { nameof(RB_Material_Group.UpdateDate),DateTime.Now},
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.Id),
+                    FiledValue=groupId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.TenantId),
+                    FiledValue=Convert.ToInt32(uid),
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.MallBaseId),
+                    FiledValue=mallBaseId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+            };
+            bool flag = material_GroupRepository.Update(keyValues, wheres);
+            if (flag) {
+                //分组下所有素材全回收
+                material_InfoRepository.SetMaterialInfoRecycled(groupId, Convert.ToInt32(uid), mallBaseId);
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除分组
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool DelMaterialGroupInfo(int groupId, string uid, int mallBaseId)
+        {
+            var gmodel = material_GroupRepository.GetEntity(groupId);
+            if (gmodel == null)
+            {
+                return false;
+            }
+            if (gmodel.Recycled != 2) {
+                return false;
+            }
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Material_Group.Status),1},
+                { nameof(RB_Material_Group.UpdateDate),DateTime.Now},
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.Id),
+                    FiledValue=groupId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.TenantId),
+                    FiledValue=Convert.ToInt32(uid),
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.MallBaseId),
+                    FiledValue=mallBaseId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+            };
+            bool flag = material_GroupRepository.Update(keyValues, wheres);
+            if (flag) {
+                //删除分组下所有的素材
+                material_InfoRepository.DelMaterialInfo("", uid, mallBaseId, groupId);
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 设置分组还原
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialGroupRestore(int groupId, string uid, int mallBaseId)
+        {
+            var gmodel = material_GroupRepository.GetEntity(groupId);
+            if (gmodel == null)
+            {
+                return false;
+            }
+            if (gmodel.Recycled != 2)
+            {
+                return false;
+            }
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Material_Group.Recycled),1},
+                { nameof(RB_Material_Group.UpdateDate),DateTime.Now},
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.Id),
+                    FiledValue=groupId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.TenantId),
+                    FiledValue=Convert.ToInt32(uid),
+                    OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                    FiledName=nameof(RB_Material_Group.MallBaseId),
+                    FiledValue=mallBaseId,
+                    OperatorEnum=OperatorEnum.Equal
+                },
+            };
+            return material_GroupRepository.Update(keyValues, wheres);
+        }
+
+        /// <summary>
+        /// 设置素材回收
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialInfoRecycled(string materialIds, string uid, int mallBaseId)
+        {
+            bool flag = material_InfoRepository.SetMaterialListRecycled(materialIds, uid, mallBaseId);
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除素材
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool DelMaterialInfo(string materialIds, string uid, int mallBaseId)
+        {
+            bool flag = material_InfoRepository.DelMaterialInfo(materialIds, uid, mallBaseId);
+            return flag;
+        }
+
+        /// <summary>
+        /// 设置素材还原
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialInfoRestore(string materialIds, string uid, int mallBaseId)
+        {
+            var trans = material_InfoRepository.DbTransaction;
+            try
+            {
+                var list = material_InfoRepository.GetList(new RB_Material_Info_Extend() { MaterialIds = materialIds, TenantId = Convert.ToInt32(uid), MallBaseId = mallBaseId });
+                if (list.Any())
+                {
+                    //查询出所有的分组
+                    var glist = material_GroupRepository.GetList(new RB_Material_Group_Extend() { GroupIds = string.Join(",", list.Select(x => x.GroupId).Distinct()), TenantId = Convert.ToInt32(uid), MallBaseId = mallBaseId });
+                    if (glist.Where(x => x.Recycled == 2).Any())
+                    {
+                        foreach (var item in glist.Where(x => x.Recycled == 2)) {
+                            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                                { nameof(RB_Material_Group.Recycled),1},
+                                { nameof(RB_Material_Group.UpdateDate),DateTime.Now},
+                            };
+                            List<WhereHelper> wheres = new List<WhereHelper>() {
+                                new WhereHelper(){
+                                    FiledName=nameof(RB_Material_Group.Id),
+                                    FiledValue=item.Id,
+                                    OperatorEnum=OperatorEnum.Equal
+                                },
+                                new WhereHelper(){
+                                    FiledName=nameof(RB_Material_Group.TenantId),
+                                    FiledValue=Convert.ToInt32(uid),
+                                    OperatorEnum=OperatorEnum.Equal
+                                },
+                                new WhereHelper(){
+                                    FiledName=nameof(RB_Material_Group.MallBaseId),
+                                    FiledValue=mallBaseId,
+                                    OperatorEnum=OperatorEnum.Equal
+                                },
+                            };
+                            material_GroupRepository.Update(keyValues, wheres, trans);
+                        }
+                    }
+                    foreach (var item in list) {
+                        Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                            { nameof(RB_Material_Info.Recycled),1},
+                            { nameof(RB_Material_Info.UpdateDate),DateTime.Now},
+                        };
+                        List<WhereHelper> wheres = new List<WhereHelper>() {
+                            new WhereHelper(){
+                                FiledName=nameof(RB_Material_Info.Id),
+                                FiledValue=item.Id,
+                                OperatorEnum=OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                FiledName=nameof(RB_Material_Info.TenantId),
+                                FiledValue=Convert.ToInt32(uid),
+                                OperatorEnum=OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                FiledName=nameof(RB_Material_Info.MallBaseId),
+                                FiledValue=mallBaseId,
+                                OperatorEnum=OperatorEnum.Equal
+                            },
+                        };
+                        material_InfoRepository.Update(keyValues, wheres, trans);
+                    }
+                }
+                material_InfoRepository.DBSession.Commit();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "SetMaterialInfoRestore");
+                material_InfoRepository.DBSession.Rollback();
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 设置分组转移
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="groupId"></param>
+        /// <param name="Type"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialInfoTransfer(string materialIds, int groupId, int Type, string uid, int mallBaseId)
+        {
+            var gmodel = material_GroupRepository.GetEntity(groupId);
+            if (gmodel == null) {
+                return false;
+            }
+            if (gmodel.Status == 1 || gmodel.Recycled == 2 || gmodel.Type != Type)
+            {
+                return false;
+            }
+            return material_InfoRepository.SetMaterialInfoTransfer(materialIds, groupId, uid, mallBaseId);
+        }
+    }
+}

Mall.Module.User/UserModule.cs

@@ -8,6 +8,8 @@ using Mall.Model.Entity.User;
 using Mall.Model.Extend.User;
 using Mall.Repository;
 using Mall.Repository.User;
+using Mall.Repository.Product;
+using Mall.Model.Extend.Product;
 
 namespace Mall.Module.User
 {
@@ -36,6 +38,14 @@ namespace Mall.Module.User
         /// 用户余额
         /// </summary>
         private readonly RB_Member_BalanceRepository member_BalanceRepository = new RB_Member_BalanceRepository();
+        /// <summary>
+        /// 素材
+        /// </summary>
+        private readonly RB_Material_InfoRepository material_InfoRepository = new RB_Material_InfoRepository();
+        /// <summary>
+        /// 分销基础配置
+        /// </summary>
+        private readonly RB_Distributor_BasicsRepository distributor_BasicsRepository = new RB_Distributor_BasicsRepository();
 
 
         /// <summary>
@@ -68,6 +78,16 @@ namespace Mall.Module.User
             return list;
         }
 
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public RB_Member_User_Extend GetMemberUserInfo(int userId)
+        {
+            return member_UserRepository.GetEntity(userId).RefMapperTo<RB_Member_User_Extend>();
+        }
+
         /// <summary>
         /// 获取列表
         /// </summary>
@@ -112,13 +132,48 @@ namespace Mall.Module.User
             if (list.Any()) {
                 string Ids = string.Join(",", list.Select(x => x.Id));
                 var elist = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeIds = Ids, TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId });
+
+                List<int> MaterialIds = new List<int>();
+                MaterialIds.AddRange(list.Select(x => x.Icon ?? 0).Distinct().ToList());
+                MaterialIds.AddRange(list.Select(x => x.BackgroundImage ?? 0).Distinct().ToList());
+                List<RB_Material_Info_Extend> mlist = new List<RB_Material_Info_Extend>();
+                if (MaterialIds.Any()) {
+                    mlist = material_InfoRepository.GetList(new RB_Material_Info_Extend() { MaterialIds = string.Join(",", MaterialIds), TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId });
+                }
                 foreach (var item in list) {
                     item.EquityList = elist.Where(x => x.GradeId == item.Id).ToList();
+                    item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? "";
+                    item.BackgroundImagePath = mlist.Where(x => x.Id == item.BackgroundImage).FirstOrDefault()?.Path ?? "";
                 }
             }
             return list;
         }
 
+        /// <summary>
+        /// 后台修改用户信息
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetMemberUserInfoForHT(RB_Member_User_Extend demodel)
+        {
+            Dictionary<string, object> files = new Dictionary<string, object>() {
+                { nameof(RB_Member_User.MemberGrade),demodel.MemberGrade},
+                { nameof(RB_Member_User.SuperiorId),demodel.SuperiorId},
+                { nameof(RB_Member_User.ContactWay),demodel.ContactWay},
+                { nameof(RB_Member_User.Remark),demodel.Remark},
+                { nameof(RB_Member_User.AliasName),demodel.AliasName},
+                { nameof(RB_Member_Grade.UpdateDate),demodel.UpdateDate}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                    FiledName=nameof(RB_Member_User.Id),
+                    FiledValue=demodel.Id,
+                    OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            return member_UserRepository.Update(files, wheres);
+        }
+
         /// <summary>
         /// 获取会员等级列表
         /// </summary>
@@ -131,9 +186,20 @@ namespace Mall.Module.User
             {
                 string Ids = string.Join(",", list.Select(x => x.Id));
                 var elist = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeIds = Ids, TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId });
+
+                List<int> MaterialIds = new List<int>();
+                MaterialIds.AddRange(list.Select(x => x.Icon ?? 0).Distinct().ToList());
+                MaterialIds.AddRange(list.Select(x => x.BackgroundImage ?? 0).Distinct().ToList());
+                List<RB_Material_Info_Extend> mlist = new List<RB_Material_Info_Extend>();
+                if (MaterialIds.Any())
+                {
+                    mlist = material_InfoRepository.GetList(new RB_Material_Info_Extend() { MaterialIds = string.Join(",", MaterialIds), TenantId = dmodel.TenantId, MallBaseId = dmodel.MallBaseId });
+                }
                 foreach (var item in list)
                 {
                     item.EquityList = elist.Where(x => x.GradeId == item.Id).ToList();
+                    item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? "";
+                    item.BackgroundImagePath = mlist.Where(x => x.Id == item.BackgroundImage).FirstOrDefault()?.Path ?? "";
                 }
             }
             return list;
@@ -190,7 +256,7 @@ namespace Mall.Module.User
                                 CreateDate = demodel.CreateDate,
                                 GradeId = demodel.Id,
                                 Id = 0,
-                                Image = Config.GetFilePath(item.Image),
+                                Image = item.Image,
                                 MallBaseId = demodel.MallBaseId,
                                 Status = 0,
                                 TenantId = demodel.TenantId,
@@ -201,7 +267,7 @@ namespace Mall.Module.User
                         foreach (var item in UpdateList) {
                             Dictionary<string, object> cols = new Dictionary<string, object>() {
                                 { nameof(RB_Member_Equity.Content),item.Content},
-                                { nameof(RB_Member_Equity.Image),Config.GetFilePath(item.Image)},
+                                { nameof(RB_Member_Equity.Image),item.Image},
                                 { nameof(RB_Member_Equity.Title),item.Title},
                                 { nameof(RB_Member_Equity.UpdateDate),demodel.UpdateDate},
                             };
@@ -249,7 +315,7 @@ namespace Mall.Module.User
                                     CreateDate = demodel.CreateDate,
                                     GradeId = Id,
                                     Id = 0,
-                                    Image = Config.GetFilePath(item.Image),
+                                    Image = item.Image,
                                     MallBaseId = demodel.MallBaseId,
                                     Status = 0,
                                     TenantId = demodel.TenantId,
@@ -399,5 +465,76 @@ namespace Mall.Module.User
             }
             return false;
         }
+
+        /// <summary>
+        /// 设置分销基础配置
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetDistributorBasicsInfo(RB_Distributor_Basics_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                Dictionary<string, object> keyValuePairs = new Dictionary<string, object>() {
+                    { nameof(RB_Distributor_Basics.DistributorTier),demodel.DistributorTier},
+                    { nameof(RB_Distributor_Basics.InPurchasing),demodel.InPurchasing},
+                    { nameof(RB_Distributor_Basics.ReferralsCondition),demodel.ReferralsCondition},
+                    { nameof(RB_Distributor_Basics.ApplyFor),demodel.ApplyFor},
+                    { nameof(RB_Distributor_Basics.DistributorCondition),demodel.DistributorCondition},
+                    { nameof(RB_Distributor_Basics.DistributorCommissionType),demodel.DistributorCommissionType},
+                    { nameof(RB_Distributor_Basics.OneCommission),demodel.OneCommission},
+                    { nameof(RB_Distributor_Basics.TwoCommission),demodel.TwoCommission},
+                    { nameof(RB_Distributor_Basics.ThreeCommission),demodel.ThreeCommission},
+                    { nameof(RB_Distributor_Basics.GradeEntrance),demodel.GradeEntrance},
+                    { nameof(RB_Distributor_Basics.GradeEntranceimage),demodel.GradeEntranceimage},
+                    { nameof(RB_Distributor_Basics.WithdrawWay),demodel.WithdrawWay},
+                    { nameof(RB_Distributor_Basics.MinimumWithdrawalLimit),demodel.MinimumWithdrawalLimit},
+                    { nameof(RB_Distributor_Basics.DailyWithdrawalLimit),demodel.DailyWithdrawalLimit},
+                    { nameof(RB_Distributor_Basics.WithdrawFee),demodel.WithdrawFee},
+                    { nameof(RB_Distributor_Basics.ApplicationProtocol),demodel.ApplicationProtocol},
+                    { nameof(RB_Distributor_Basics.UserNotes),demodel.UserNotes},
+                    { nameof(RB_Distributor_Basics.BackgroundImage),demodel.BackgroundImage},
+                    { nameof(RB_Distributor_Basics.IndexImage),demodel.IndexImage},
+                    { nameof(RB_Distributor_Basics.UpdateDate),demodel.UpdateDate}
+                };
+                List<WhereHelper> whereHelpers = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Distributor_Basics.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    },
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Distributor_Basics.TenantId),
+                          FiledValue=demodel.TenantId,
+                           OperatorEnum=OperatorEnum.Equal
+                    },
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Distributor_Basics.MallBaseId),
+                          FiledValue=demodel.MallBaseId,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return distributor_BasicsRepository.Update(keyValuePairs, whereHelpers);
+            }
+            else {
+                return distributor_BasicsRepository.Insert(demodel) > 0;
+            }
+        }
+
+        /// <summary>
+        /// 获取分销基础信息
+        /// </summary>
+        /// <param name="basicsId"></param>
+        /// <returns></returns>
+        public RB_Distributor_Basics_Extend GetDistributorBasicsInfo(int basicsId)
+        {
+            var model = distributor_BasicsRepository.GetEntity(basicsId).RefMapperTo<RB_Distributor_Basics_Extend>();
+            if (model == null) {
+                return new RB_Distributor_Basics_Extend();
+            }
+            model.IndexImagePath = material_InfoRepository.GetEntity(model.IndexImage)?.Path ?? "";
+            model.BackgroundImagePath = material_InfoRepository.GetEntity(model.BackgroundImage)?.Path ?? "";
+            return model;
+        }
     }
 }

Mall.Repository/Mall.Repository.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>

Mall.Repository/Product/RB_Material_GroupRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 素材管理仓储层
+    /// </summary>
+    public class RB_Material_GroupRepository : RepositoryBase<RB_Material_Group>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Material_Group_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Group_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Material_Group.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Material_Group.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Material_Group.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Material_Group.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name)) {
+                where += $@" and {nameof(RB_Material_Group.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Type > 0) {
+                where += $@" and {nameof(RB_Material_Group.Type)}={dmodel.Type}";
+            }
+            if (dmodel.Recycled > 0) {
+                where += $@" and {nameof(RB_Material_Group.Recycled)}={dmodel.Recycled}";
+            }
+            string sql = $@"select * from RB_Material_Group where {where} order by Id desc";
+            return GetPage<RB_Material_Group_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Material_Group_Extend> GetList(RB_Material_Group_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Material_Group.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Material_Group.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Material_Group.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Material_Group.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GroupIds)) {
+                where += $@" and {nameof(RB_Material_Group.Id)} in({dmodel.GroupIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and {nameof(RB_Material_Group.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Type > 0)
+            {
+                where += $@" and {nameof(RB_Material_Group.Type)}={dmodel.Type}";
+            }
+            if (dmodel.Recycled > 0)
+            {
+                where += $@" and {nameof(RB_Material_Group.Recycled)}={dmodel.Recycled}";
+            }
+            string sql = $@"select * from RB_Material_Group where {where} order by Sort,Id desc";
+            return Get<RB_Material_Group_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Material_InfoRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 素材管理仓储层
+    /// </summary>
+    public class RB_Material_InfoRepository : RepositoryBase<RB_Material_Info>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Material_Info_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Info_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Material_Info.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Material_Info.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Material_Info.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Material_Info.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name)) {
+                where += $@" and {nameof(RB_Material_Info.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Type > 0) {
+                where += $@" and {nameof(RB_Material_Info.Type)}={dmodel.Type}";
+            }
+            if (dmodel.GroupId > 0) {
+                where += $@" and {nameof(RB_Material_Info.GroupId)}={dmodel.GroupId}";
+            }
+            if (dmodel.Recycled > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.Recycled)}={dmodel.Recycled}";
+            }
+
+            string sql = $@"select * from RB_Material_Info where {where} order by Id desc";
+            return GetPage<RB_Material_Info_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Material_Info_Extend> GetList(RB_Material_Info_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Material_Info.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.MaterialIds)) 
+            {
+                where += $@" and {nameof(RB_Material_Info.Id)} in({dmodel.MaterialIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and {nameof(RB_Material_Info.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Type > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.Type)}={dmodel.Type}";
+            }
+            if (dmodel.GroupId > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.GroupId)}={dmodel.GroupId}";
+            }
+            if (dmodel.Recycled > 0)
+            {
+                where += $@" and {nameof(RB_Material_Info.Recycled)}={dmodel.Recycled}";
+            }
+
+            string sql = $@"select * from RB_Material_Info where {where} order by Id desc";
+            return Get<RB_Material_Info_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 分组下所有素材全回收
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        public bool SetMaterialInfoRecycled(int groupId, int tenantId, int mallBaseId)
+        {
+            string sql = $@" Update RB_Material_Info Set Recycled=2 where GroupId={groupId} and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            return Execute(sql) > 0;
+        }
+
+        /// <summary>
+        /// 设置批量素材回收
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialListRecycled(string materialIds, string uid, int mallBaseId)
+        {
+            string sql = $@" Update RB_Material_Info Set Recycled=2 where Id in({materialIds}) and TenantId={uid} and MallBaseId={mallBaseId} and Status=0";
+            return Execute(sql) > 0;
+        }
+
+        /// <summary>
+        /// 删除素材
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public bool DelMaterialInfo(string materialIds, string uid, int mallBaseId, int groupId = 0)
+        {
+            if (groupId > 0) {
+                string sql1 = $@" Update RB_Material_Info Set Status=1 where GroupId ={groupId} and TenantId={uid} and MallBaseId={mallBaseId} and Status=0 and Recycled=2";
+                return Execute(sql1) > 0;
+            }
+            string sql = $@" Update RB_Material_Info Set Status=1 where Id in({materialIds}) and TenantId={uid} and MallBaseId={mallBaseId} and Status=0 and Recycled=2";
+            return Execute(sql) > 0;
+        }
+
+        /// <summary>
+        /// 素材转移
+        /// </summary>
+        /// <param name="materialIds"></param>
+        /// <param name="groupId"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetMaterialInfoTransfer(string materialIds, int groupId, string uid, int mallBaseId)
+        {
+            string sql = $@" Update RB_Material_Info Set GroupId={groupId} where Id in({materialIds}) and TenantId={uid} and MallBaseId={mallBaseId} and Status=0 and Recycled=1";
+            return Execute(sql) > 0;
+        }
+    }
+}

Mall.Repository/User/RB_Distributor_BasicsRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 分销商基础设置仓储层
+    /// </summary>
+    public class RB_Distributor_BasicsRepository : RepositoryBase<RB_Distributor_Basics>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Distributor_Basics_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Distributor_Basics_Extend dmodel)
+        {
+            string where = " 1=1 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Member_User.Id)}={dmodel.Id}";
+            }
+            
+            string sql = $@"select * from RB_Distributor_Basics where {where} order by Id desc";
+            return GetPage<RB_Distributor_Basics_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Basics_Extend> GetList(RB_Distributor_Basics_Extend dmodel)
+        {
+            string where = " 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Member_User.Id)}={dmodel.Id}";
+            }
+
+            string sql = $@"select * from RB_Distributor_Basics where {where} order by Id desc";
+            return Get<RB_Distributor_Basics_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Member_EquityRepository.cs

@@ -48,27 +48,29 @@ namespace Mall.Repository.User
         /// <returns></returns>
         public List<RB_Member_Equity_Extend> GetList(RB_Member_Equity_Extend dmodel)
         {
-            string where = $" 1=1 and {nameof(RB_Member_Equity.Status)}=0";
+            string where = $" 1=1 and e.{nameof(RB_Member_Equity.Status)}=0";
             if (dmodel.TenantId > 0)
             {
-                where += $@" and {nameof(RB_Member_Equity.TenantId)}={dmodel.TenantId}";
+                where += $@" and e.{nameof(RB_Member_Equity.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Member_Equity.MallBaseId)}={dmodel.MallBaseId}";
+                where += $@" and e.{nameof(RB_Member_Equity.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (!string.IsNullOrEmpty(dmodel.Title))
             {
-                where += $@" and {nameof(RB_Member_Equity.Title)} like '%{dmodel.Title}%'";
+                where += $@" and e.{nameof(RB_Member_Equity.Title)} like '%{dmodel.Title}%'";
             }
             if (dmodel.GradeId > 0)
             {
-                where += $@" and {nameof(RB_Member_Equity.GradeId)} ={dmodel.GradeId}";
+                where += $@" and e.{nameof(RB_Member_Equity.GradeId)} ={dmodel.GradeId}";
             }
             if (!string.IsNullOrEmpty(dmodel.GradeIds)) {
-                where += $@" and {nameof(RB_Member_Equity.GradeId)} in({dmodel.GradeIds})";
+                where += $@" and e.{nameof(RB_Member_Equity.GradeId)} in({dmodel.GradeIds})";
             }
-            string sql = $@"select * from RB_Member_Equity where {where} order by Id desc";
+            string sql = $@"select e.*,mi.Name as ImagePath from RB_Member_Equity e
+left join rb_material_info mi on e.Image=mi.Id
+where {where} order by e.Id desc";
             return Get<RB_Member_Equity_Extend>(sql).ToList();
         }
     }

Mall.WebApi/Controllers/Product/ProductController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.Common.API;
+using Mall.Model.Extend.Product;
+using Mall.Module.User;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Mall.Common.Plugin;
+using Mall.Common.Enum.User;
+using Mall.CacheManager.User;
+using Newtonsoft.Json.Linq;
+using Mall.Common;
+using Mall.Module.Product;
+
+namespace Mall.WebApi.Controllers.MallBase
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class ProductController : BaseController
+    {
+
+        private readonly ProductModule productModule = new ProductModule();
+
+        #region 素材管理
+        /// <summary>
+        /// 获取素材分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMaterialInfoPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Material_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Info_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            var list = productModule.GetMaterialInfoPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Type,
+                x.Path,
+                x.Image,
+                x.VideoTime,
+                x.WithHeight,
+                x.Recycled,
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 新增素材信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialInfo() {
+            var parms = RequestParm;
+            RB_Material_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Info_Extend>(parms.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name))
+            {
+                return ApiResult.ParamIsNull("请输入分组名称");
+            }
+            if (demodel.Type != 1 && demodel.Type != 2)
+            {
+                return ApiResult.ParamIsNull("请传递类型");
+            }
+            if ((demodel.GroupId ?? 0) < 0) {
+                return ApiResult.ParamIsNull("请输入分组");
+            }
+            if (string.IsNullOrEmpty(demodel.Path)) {
+                return ApiResult.ParamIsNull("请传递文件路径");
+            }
+
+            demodel.Path = Config.GetFilePath(demodel.Path);
+            demodel.Image = Config.GetFilePath(demodel.Image);
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            demodel.Status = 0;
+            demodel.Recycled = 1;
+            bool flag = productModule.SetMaterialInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取素材分组列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMaterialGroupList()
+        {
+            var parms = RequestParm;
+            RB_Material_Group_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Group_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            var list = productModule.GetMaterialGroupList(demodel);
+            return ApiResult.Success("", list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Type,
+                x.Sort,
+                x.Recycled,
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
+            }));
+        }
+
+        /// <summary>
+        /// 新增修改分组
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialGroupInfo() {
+            var parms = RequestParm;
+            RB_Material_Group_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Group_Extend>(parms.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name)) {
+                return ApiResult.ParamIsNull("请输入分组名称");
+            }
+            if (demodel.Type != 1 && demodel.Type != 2) {
+                return ApiResult.ParamIsNull("请传递类型");
+            }
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            demodel.Status = 0;
+            demodel.Recycled = 1;
+            bool flag = productModule.SetMaterialGroupInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置分组回收
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialGroupRecycled() {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            if (GroupId < 0) {
+                return ApiResult.ParamIsNull("请传递分组id");
+            }
+
+            bool flag = productModule.SetMaterialGroupRecycled(GroupId, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除分组信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelMaterialGroupInfo()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            if (GroupId < 0)
+            {
+                return ApiResult.ParamIsNull("请传递分组id");
+            }
+
+            bool flag = productModule.DelMaterialGroupInfo(GroupId, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置分组还原
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialGroupRestore()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            int GroupId = parms.GetInt("GroupId", 0);
+            if (GroupId < 0)
+            {
+                return ApiResult.ParamIsNull("请传递分组id");
+            }
+
+            bool flag = productModule.SetMaterialGroupRestore(GroupId, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+
+        /// <summary>
+        /// 设置素材回收
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialInfoRecycled()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            string MaterialIds = parms.GetStringValue("MaterialIds");
+            if (string.IsNullOrEmpty(MaterialIds))
+            {
+                return ApiResult.ParamIsNull("请传递素材ids");
+            }
+
+            bool flag = productModule.SetMaterialInfoRecycled(MaterialIds, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除素材信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelMaterialInfo()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            string MaterialIds = parms.GetStringValue("MaterialIds");
+            if (string.IsNullOrEmpty(MaterialIds))
+            {
+                return ApiResult.ParamIsNull("请传递素材ids");
+            }
+
+            bool flag = productModule.DelMaterialInfo(MaterialIds, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置素材还原
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialInfoRestore()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            string MaterialIds = parms.GetStringValue("MaterialIds");
+            if (string.IsNullOrEmpty(MaterialIds))
+            {
+                return ApiResult.ParamIsNull("请传递素材ids");
+            }
+
+            bool flag = productModule.SetMaterialInfoRestore(MaterialIds, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置素材转移
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMaterialInfoTransfer()
+        {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            string MaterialIds = parms.GetStringValue("MaterialIds");
+            int GroupId = parms.GetInt("GroupId", 0);
+            int Type = parms.GetInt("Type", 0);
+            if (string.IsNullOrEmpty(MaterialIds))
+            {
+                return ApiResult.ParamIsNull("请传递素材ids");
+            }
+            if (GroupId <= 0) 
+            {
+                return ApiResult.ParamIsNull("请传递分组id");
+            }
+
+            bool flag = productModule.SetMaterialInfoTransfer(MaterialIds, GroupId, Type, requestParm.uid, requestParm.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Mall.WebApi/Controllers/User/UserController.cs

@@ -39,6 +39,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             var list = userModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -68,6 +69,85 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", pagelist);
         }
 
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMemberUserInfo() {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            int UserId = parms.GetInt("UserId", 0);
+            if (UserId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            var model = userModule.GetMemberUserInfo(UserId);
+            if (model.TenantId != Convert.ToInt32(requestParm.uid))
+            {
+                return ApiResult.ParamIsNull("未查询到该用户信息");
+            }
+            if (model.MallBaseId != requestParm.MallBaseId) {
+                return ApiResult.ParamIsNull("未查询到该用户信息");
+            }
+            string SuperiorName = "";
+            if (model.SuperiorId > 0) {
+                SuperiorName = userModule.GetMemberUserInfo(model.SuperiorId ?? 0)?.Name ?? "";
+            }
+            return ApiResult.Success("", new
+            {
+                model.Id,
+                model.Photo,
+                model.Name,
+                model.AliasName,
+                model.MemberGrade,
+                model.SuperiorId,
+                SuperiorName,
+                model.Blacklist,
+                model.ContactWay,
+                model.Moblie,
+                model.Remark,
+                CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+        }
+
+        /// <summary>
+        /// 后台更新用户信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMemberUserInfoForHT() {
+            var parms = RequestParm;
+            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString());
+            if (demodel.Id <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+            var umodel = userModule.GetMemberUserInfo(demodel.Id);
+            if (umodel == null) {
+                return ApiResult.Failed("用户不存在");
+            }
+            if (umodel.TenantId != Convert.ToInt32(parms.uid))
+            {
+                return ApiResult.ParamIsNull("未查询到该用户信息");
+            }
+            if (umodel.MallBaseId != parms.MallBaseId)
+            {
+                return ApiResult.ParamIsNull("未查询到该用户信息");
+            }
+            if (!(demodel.SuperiorId == 0 || demodel.SuperiorId == umodel.SuperiorId)) {
+                return ApiResult.ParamIsNull("上级id有误");
+            }
+
+            bool flag = userModule.SetMemberUserInfoForHT(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
         /// <summary>
         /// 用户信息下载
         /// </summary>
@@ -101,6 +181,7 @@ namespace Mall.WebApi.Controllers.MallBase
             try
             {
                 demodel.TenantId = Convert.ToInt32(parms.uid);
+                demodel.MallBaseId = parms.MallBaseId;
                 var list = userModule.GetMemberUserList(demodel);
                 #region 组装数据
                 int Num = 0;
@@ -206,6 +287,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Member_Grade_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Grade_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             var list = userModule.GetMemberGradePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -214,15 +296,18 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Name,
                 x.Grade,
                 x.BackgroundImage,
+                x.BackgroundImagePath,
                 x.Discount,
                 x.Enabled,
                 EquityList= x.EquityList.Select(x=>new { 
                     x.Id,
                     x.Content,
                     x.Image,
+                    x.ImagePath,
                     x.Title
                 }),
                 x.Icon,
+                x.IconPath,
                 x.IsAutoUpGrade,
                 x.IsMemberBuy,
                 x.MemberBuyMoney,
@@ -246,13 +331,16 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Member_Grade_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Grade_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             var list = userModule.GetMemberGradeList(demodel);
             return ApiResult.Success("", list.Select(x=>new { 
                 x.Id,
                 x.Grade,
                 x.Name,
                 x.Icon,
-                x.BackgroundImage
+                x.IconPath,
+                x.BackgroundImage,
+                x.BackgroundImagePath
             }));
         }
 
@@ -280,10 +368,11 @@ namespace Mall.WebApi.Controllers.MallBase
             if ((demodel.Enabled ?? 0) <= 0) {
                 return ApiResult.ParamIsNull("请选择会员状态");
             }
-            if (string.IsNullOrEmpty(demodel.Icon)) {
+            if ((demodel.Icon ?? 0) <= 0)
+            {
                 return ApiResult.ParamIsNull("请选择会员图标");
             }
-            if (string.IsNullOrEmpty(demodel.BackgroundImage))
+            if ((demodel.BackgroundImage ?? 0) <= 0)
             {
                 return ApiResult.ParamIsNull("请选择会员背景图");
             }
@@ -310,12 +399,11 @@ namespace Mall.WebApi.Controllers.MallBase
                 demodel.MemberBuyMoney = 0;
             }
 
-            demodel.Icon = Config.GetFilePath(demodel.Icon);
-            demodel.BackgroundImage = Config.GetFilePath(demodel.BackgroundImage);
             demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
             demodel.Status = 0;
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             bool flag = userModule.SetMemberGradeInfo(demodel);
             if (flag)
             {
@@ -400,8 +488,9 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             demodel.Description = demodel.Description ?? "";
-            demodel.Image = Config.GetFilePath(demodel.Image);
+            demodel.Image = demodel.Image ?? 0;
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             demodel.CreateDate = DateTime.Now;
             bool flag = userModule.SetMemberIntegralInfo(demodel);
             if (flag)
@@ -426,6 +515,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Member_Balance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Balance_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             List<RB_Member_Balance_Extend> list = userModule.GetMemberBalancePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -470,8 +560,9 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             demodel.Description = demodel.Description ?? "";
-            demodel.Image = Config.GetFilePath(demodel.Image);
+            demodel.Image = demodel.Image ?? 0;
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             demodel.CreateDate = DateTime.Now;
             bool flag = userModule.SetMemberBalanceInfo(demodel);
             if (flag)
@@ -485,5 +576,99 @@ namespace Mall.WebApi.Controllers.MallBase
 
         }
         #endregion
+
+        #region 分销商设置
+
+        /// <summary>
+        /// 新增分销商基础
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetDistributorBasicsInfo() {
+            var requestParm = RequestParm;
+            RB_Distributor_Basics_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Basics_Extend>(requestParm.msg.ToString());
+            if (demodel.DistributorTier != 0 && demodel.DistributorTier != 1 && demodel.DistributorTier != 2 && demodel.DistributorTier != 3) {
+                return ApiResult.ParamIsNull("请选择分销层级");
+            }
+            switch (demodel.DistributorTier) {
+                case 0:
+                    demodel.OneCommission = 0;
+                    demodel.TwoCommission = 0;
+                    demodel.ThreeCommission = 0;
+                    break;
+                case 1:
+                    demodel.TwoCommission = 0;
+                    demodel.ThreeCommission = 0;
+                    break;
+                case 2:
+                    demodel.ThreeCommission = 0;
+                    break;
+            }
+
+            demodel.OneCommission = demodel.OneCommission ?? 0;
+            demodel.TwoCommission = demodel.TwoCommission ?? 0;
+            demodel.ThreeCommission = demodel.ThreeCommission ?? 0;
+            demodel.WithdrawFee = demodel.WithdrawFee ?? 0;
+            demodel.MinimumWithdrawalLimit = demodel.MinimumWithdrawalLimit ?? 0;
+            demodel.DailyWithdrawalLimit = demodel.DailyWithdrawalLimit ?? 0;
+            demodel.BackgroundImage = demodel.BackgroundImage ?? 0;
+            demodel.IndexImage = demodel.IndexImage ?? 0;
+            demodel.TenantId = Convert.ToInt32(requestParm.uid);
+            demodel.MallBaseId = requestParm.MallBaseId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = userModule.SetDistributorBasicsInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取分销商基础信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDistributorBasicsInfo() {
+            var requestParm = RequestParm;
+            var parms = JObject.Parse(requestParm.msg.ToString());
+            int BasicsId = parms.GetInt("BasicsId", 0);
+            if (BasicsId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            var model = userModule.GetDistributorBasicsInfo(BasicsId);
+            return ApiResult.Success("", new
+            {
+                model.Id,
+                model.DistributorTier,
+                model.InPurchasing,
+                model.ReferralsCondition,
+                model.ApplyFor,
+                model.DistributorCondition,
+                model.DistributorCommissionType,
+                model.OneCommission,
+                model.TwoCommission,
+                model.ThreeCommission,
+                model.GradeEntrance,
+                model.GradeEntranceimage,
+                model.WithdrawWay,
+                model.MinimumWithdrawalLimit,
+                model.DailyWithdrawalLimit,
+                model.WithdrawFee,
+                model.ApplicationProtocol,
+                model.UserNotes,
+                model.BackgroundImage,
+                model.BackgroundImagePath,
+                model.IndexImage,
+                model.IndexImagePath,
+                UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Mall.WebApi.csproj

@@ -15,6 +15,7 @@
     <ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />
     <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
     <ProjectReference Include="..\Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj" />
+    <ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
     <ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
     <ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
   </ItemGroup>

Mall.sln

@@ -31,7 +31,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Repository", "Mall.Rep
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.User", "Mall.Module.User\Mall.Module.User.csproj", "{E56423C0-5AC2-48D8-88BE-5435EF6ADB3F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.BaseSetUp", "Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj", "{9C400D7F-2BE2-40E7-B179-498097AA00AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.BaseSetUp", "Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj", "{9C400D7F-2BE2-40E7-B179-498097AA00AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.Product", "Mall.Module.Product\Mall.Module.Product.csproj", "{D0386A52-CAFD-40B3-A515-9A9241189FBA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -83,6 +85,10 @@ Global
 		{9C400D7F-2BE2-40E7-B179-498097AA00AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9C400D7F-2BE2-40E7-B179-498097AA00AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C400D7F-2BE2-40E7-B179-498097AA00AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -98,6 +104,7 @@ Global
 		{46E2983C-2CAF-4850-A6FC-804A7C425F76} = {E239A6CD-DA5B-4E7A-B997-8D17C8E18EB6}
 		{E56423C0-5AC2-48D8-88BE-5435EF6ADB3F} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 		{9C400D7F-2BE2-40E7-B179-498097AA00AB} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
+		{D0386A52-CAFD-40B3-A515-9A9241189FBA} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {450F460D-A6AE-4FE3-948A-34E5FB8DBD7C}