11

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminSystemRoleController.cs

@@ -66,7 +66,7 @@ namespace GxPress.Api.AdminControllers
         /// <param name="model"></param>
         /// <returns></returns>
          [HttpPost("add-menu")]
-        public async Task<bool> InsertMenusAsync(Entity.Menus.Menus model)
+        public async Task<bool> InsertMenusAsync([FromBody] List<Entity.Menus.Menus> model)
         {
             return await roleService.InsertMenusAsync(model);
         }

gx_api/GxPress/Model/GxPress.Entity/Menus/Menus.cs

@@ -37,7 +37,7 @@ namespace GxPress.Entity.Menus
         /// 孩子
         /// </summary>
         /// <value></value>
-        public List<Menus> Children { get; set; }
+        public List<Children> Children { get; set; }
         /// <summary>
         /// 路径
         /// </summary>
@@ -45,4 +45,45 @@ namespace GxPress.Entity.Menus
         [DataColumn]
         public string Path { get; set; }
     }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class Children
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 父级ID
+        /// </summary>
+        /// <value></value>
+        public int ParentId { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Title { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <value></value>
+
+        public string Name { get; set; }
+        /// <summary>
+        /// 图标名称
+        /// </summary>
+        /// <value></value>
+
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string Path { get; set; }
+    }
 }

gx_api/GxPress/Model/GxPress.Entity/tede2/Media/Media.cs

@@ -147,5 +147,23 @@ namespace GxPress.Entity.tede2.Media
         /// <value></value>
         [DataColumn]
         public string Creator { get; set; }
+
+        /// <summary>
+        /// ios折扣价格打折
+        /// </summary>
+        [DataColumn]
+        public decimal IosDiscountPrice { get; set; }
+        /// <summary>
+        /// 其他折扣价格打折
+        /// </summary>
+        [DataColumn]
+        public decimal OtherDiscountPrice { get; set; }
+
+        /// <summary>
+        /// 免费类容占比
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public decimal FreeProportion { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Mappings/MenuMapping.cs

@@ -0,0 +1,15 @@
+using AutoMapper;
+using GxPress.Entity.Menus;
+
+namespace GxPress.Mappings
+{
+    public class MenuMapping: Profile
+    {
+        public MenuMapping()
+        {
+            CreateMap<Menus, Children>();
+             CreateMap<Children, Menus>();
+        }
+        
+    }
+}

gx_api/GxPress/Model/GxPress.Result/Media/MediaResult.cs

@@ -161,6 +161,28 @@ namespace GxPress.Result.Media
         /// 排序
         /// </summary>
         public int Sort { get; set; }
+
+        /// <summary>
+        /// ios折扣价格打折
+        /// </summary>
+        public decimal IosDiscountPrice { get; set; }
+        /// <summary>
+        /// IOS价格
+        /// </summary>
+        public decimal IosPrice { get; set; }
+        /// <summary>
+        /// 其他折扣价格打折
+        /// </summary>
+        public decimal OtherDiscountPrice { get; set; }
+        /// <summary>
+        /// 其他价格
+        /// </summary>
+        public decimal OtherPrice { get; set; }
+        /// <summary>
+        /// 免费类容占比
+        /// </summary>
+        /// <value></value>
+        public decimal FreeProportion { get; set; }
     }
     /// <summary>
     /// 媒体标签

gx_api/GxPress/Repository/GxPress.Repository.Implement/Menus/MenusRepository.cs

@@ -49,7 +49,7 @@ namespace GxPress.Repository.Implement.Menus
             list = all.Where(n => n.ParentId == 0).ToList();
             foreach (var item in list)
             {
-                item.Children = all.Where(n => n.ParentId == item.Id).ToList();
+                item.Children = all.Where(n => n.ParentId == item.Id).Select(n=>_mapper.Map<Entity.Menus.Children>(n)).ToList();
             }
             return list;
         }
@@ -61,7 +61,7 @@ namespace GxPress.Repository.Implement.Menus
             list = all.Where(n => n.ParentId == 0).ToList();
             foreach (var item in list)
             {
-                item.Children = all.Where(n => n.ParentId == item.Id).ToList();
+                item.Children = all.Where(n => n.ParentId == item.Id).Select(n=>_mapper.Map<Entity.Menus.Children>(n)).ToList();
             }
             return list;
         }

gx_api/GxPress/Service/GxPress.Service.Implement/Role/RoleService.cs

@@ -7,6 +7,8 @@ using GxPress.Request.Role;
 using System.Collections.Generic;
 using System.Linq;
 using System.Transactions;
+using AutoMapper;
+
 namespace GxPress.Service.Implement.Role
 {
     public class RoleService : IRoleService
@@ -15,11 +17,14 @@ namespace GxPress.Service.Implement.Role
         private readonly IMenusRepository menusRepository;
 
         private readonly ISystemRoleRepository systemRoleRepository;
-        public RoleService(ISystemRoleMenusRepository systemRoleMenusRepository, IMenusRepository menusRepository, ISystemRoleRepository systemRoleRepository)
+
+       private readonly IMapper _mapper;
+        public RoleService(ISystemRoleMenusRepository systemRoleMenusRepository, IMenusRepository menusRepository, ISystemRoleRepository systemRoleRepository,IMapper _mapper)
         {
             this.systemRoleRepository = systemRoleRepository;
             this.systemRoleMenusRepository = systemRoleMenusRepository;
             this.menusRepository = menusRepository;
+            this._mapper=_mapper;
         }
         /// <summary>
         /// 添加权限菜单关联
@@ -82,9 +87,11 @@ namespace GxPress.Service.Implement.Role
                     foreach (var item in models)
                     {
                         var id = await menusRepository.InsertAsync(item);
+                        if (item.Children == null)
+                            continue;
                         foreach (var menu in item.Children)
                         {
-                            await menusRepository.InsertAsync(menu);
+                            await menusRepository.InsertAsync(_mapper.Map<Entity.Menus.Menus>(menu));
                         }
                     }
                     transactionScope.Complete();

gx_api/GxPress/Service/GxPress.Service.Interface/Role/IRoleService.cs

@@ -37,6 +37,8 @@ namespace GxPress.Service.Interface.Role
         /// <param name="models"></param>
         /// <returns></returns>
         Task<bool> InsertMenusAsync(Entity.Menus.Menus model);
+
+        Task<bool> InsertMenusAsync(List<Entity.Menus.Menus> models);
         /// <summary>
         /// 修改菜单
         /// </summary>