Browse Source

修正广告管理的bug

懒得勤快 3 years ago
parent
commit
d725d0b8ee

+ 1 - 1
src/Masuit.MyBlogs.Core/Configs/MappingProfile.cs

@@ -73,7 +73,7 @@ namespace Masuit.MyBlogs.Core.Configs
             CreateMap<Post, PostMergeRequestDto>().ReverseMap();
 
             CreateMap<Advertisement, AdvertisementViewModel>().ForMember(m => m.AverageViewCount, e => e.MapFrom(a => a.ClickRecords.GroupBy(r => r.Time.Date).Select(g => g.Count()).DefaultIfEmpty().Average())).ForMember(m => m.ViewCount, e => e.MapFrom(a => a.ClickRecords.Count));
-            CreateMap<AdvertisementDto, Advertisement>().ForMember(a => a.Status, e => e.Ignore()).ForMember(a => a.UpdateTime, e => e.MapFrom(a => DateTime.Now));
+            CreateMap<AdvertisementDto, Advertisement>().ForMember(a => a.ClickRecords, e => e.Ignore()).ForMember(a => a.Status, e => e.Ignore()).ForMember(a => a.UpdateTime, e => e.MapFrom(a => DateTime.Now));
 
             CreateMap<Donate, DonateDto>();
 

+ 3 - 2
src/Masuit.MyBlogs.Core/Controllers/AdvertisementController.cs

@@ -1,7 +1,6 @@
 using AutoMapper.QueryableExtensions;
 using Masuit.MyBlogs.Core.Common;
 using Masuit.MyBlogs.Core.Extensions;
-using Masuit.MyBlogs.Core.Infrastructure.Repository;
 using Masuit.MyBlogs.Core.Infrastructure.Services.Interface;
 using Masuit.MyBlogs.Core.Models.DTO;
 using Masuit.MyBlogs.Core.Models.Entity;
@@ -84,6 +83,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [HttpPost, MyAuthorize]
         public async Task<IActionResult> Save(AdvertisementDto model)
         {
+            var entity = AdsService[model.Id];
             model.CategoryIds = model.CategoryIds?.Replace("null", "");
             model.Regions = Regex.Replace(model.Regions ?? "", @"(\p{P}|\p{Z}|\p{S})+", "|");
             if (model.RegionMode == RegionLimitMode.All)
@@ -101,7 +101,8 @@ namespace Masuit.MyBlogs.Core.Controllers
                 return ResultData(null, false, "宣传小图不能为空");
             }
 
-            var b = await AdsService.AddOrUpdateSavedAsync(a => a.Id, model.Mapper<Advertisement>()) > 0;
+            Mapper.Map(model, entity);
+            var b = await AdsService.AddOrUpdateSavedAsync(a => a.Id, entity) > 0;
             return ResultData(null, b, b ? "保存成功" : "保存失败");
         }
 

+ 1 - 1
src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -66,7 +66,7 @@
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.15" />
         <PackageReference Include="TimeZoneConverter" Version="3.5.0" />
         <PackageReference Include="WilderMinds.RssSyndication" Version="1.7.0" />
-        <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.13.4" />
+        <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.13.5" />
     </ItemGroup>
     <ItemGroup>
         <Content Update="appsettings.json">

+ 0 - 3
src/Masuit.MyBlogs.Core/wwwroot/Content/common/style.css

@@ -305,9 +305,6 @@ Custom bottom spacer
     margin-bottom: 10px;
     padding: 5px;
 }
-.notice img {
-    max-height: 80px;
-}
 .layui-layer-content img {
     max-height: 50vh;
     max-width: 100%;