Merge branch 'master' of https://git.zhongjie51.com/zhongjie51/99ditui into dev

# Conflicts:
#	src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

src/platform/ZhonTai.Admin/Domain/Notice/NoticeEntity.cs

@@ -27,7 +27,7 @@ namespace ZhonTai.Admin.Domain.Notice
         /// </summary>        
         public int Rank { get; set; }
         /// <summary>
-        /// 是否首页弹窗 1弹窗 0不弹窗(只有一个)
+        /// 是否首页弹窗 1弹窗(只有一个) 0不弹窗
         /// </summary>
         public int IsAlter { get; set; } = 0;
         /// <summary>

src/platform/ZhonTai.Admin/Domain/Project/ProjectConfigEntity.cs

@@ -11,7 +11,7 @@ namespace ZhonTai.Admin.Domain.Project
     /// <summary>
     /// 项目配置
     /// </summary>
-    [Table(Name = "ad_project_config")]
+    [Table(Name = "ditui_project_config")]
     public partial class ProjectConfigEntity : EntityTenant
     {
         /// <summary>

src/platform/ZhonTai.Admin/Services/Notice/NoticeService.cs

@@ -45,12 +45,13 @@ namespace ZhonTai.Admin.Services.Notice
         [HttpPost]
         public async Task<PageOutput<NoticeListOutput>> GetPageAsync(PageInput<NoticeGetPageDto> input)
         {
-            var list = await _moduleRepository.Select            
+            var list = await _moduleRepository.Select.Where(m=>m.IsAlter==0)            
             .Count(out var total)
+            .OrderByDescending(true,c=>c.IsAlter)
+            .OrderByDescending(true, c => c.Rank)
             .OrderByDescending(true, c => c.Id)
             .Page(input.CurrentPage, input.PageSize)
             .ToListAsync<NoticeListOutput>();
-
             var data = new PageOutput<NoticeListOutput>()
             {
                 List = list,
@@ -67,7 +68,7 @@ namespace ZhonTai.Admin.Services.Notice
         /// <returns></returns>
         public async Task<long> AddAsync(NoticeAddInput input)
         {
-            var entity = Mapper.Map<NoticeEntity>(input);
+            var entity = Mapper.Map<NoticeEntity>(input);           
             await _moduleRepository.InsertAsync(entity);
 
             return entity.Id;
@@ -108,6 +109,15 @@ namespace ZhonTai.Admin.Services.Notice
         public async Task BatchSoftDeleteAsync(long[] ids)
         {
             await _moduleRepository.SoftDeleteAsync(ids);
-        }
+        }        
+        /// <summary>
+        /// 查询弹窗模块
+        /// </summary>        
+        /// <returns></returns>
+        public async Task<NoticeGetOutput> GetWeightAsync()
+        {
+            var result = await _moduleRepository.Where(m=>m.IsAlter==1).ToOneAsync<NoticeGetOutput>();
+            return result;
+        }                
     }
 }

src/platform/ZhonTai.Admin/Services/Project/ProjectPriceService.cs

@@ -40,6 +40,8 @@ namespace ZhonTai.Admin.Services.Project
         [HttpGet]
         public async Task<CompanyDrawOutput> GetCompanyDrawAsync()
         {
+            await ProjectPriceInitAsync();
+
             var list = await _projectConfigRepository.Select.Where(m => m.ProjectId == 0 && m.ProjectPriceId == 0 && m.Status == 1)
             .ToListAsync(a => new
             {
@@ -54,8 +56,8 @@ namespace ZhonTai.Admin.Services.Project
                 var current = list.FirstOrDefault(m => m.EffectDate <= dtnow);
                 var next = list.FirstOrDefault(m => m.EffectDate > dtnow);
                 output.CurrentRatio = current.DrawRatio;
-                output.NextRatio = current.DrawRatio;
-                output.NextEffectDate = current.EffectDate;
+                output.NextRatio = next.DrawRatio;
+                output.NextEffectDate = next.EffectDate;
             }
             else
             {
@@ -197,11 +199,30 @@ namespace ZhonTai.Admin.Services.Project
         private void CheckDrawRatioEffect(DateTime effectDate)
         {
             //生效时间
-            if (effectDate > DateTime.Today)
+            if (effectDate <= DateTime.Today)
             {
                 throw ResultOutput.Exception("生效日期，最短为次日生效");
             }
         }
+        /// <summary>
+        /// 初始化公司抽成信息
+        /// </summary>        
+        /// <returns></returns>
+        private async Task ProjectPriceInitAsync()
+        {
+            var count = await _projectConfigRepository.Select.Where(m => m.ProjectId == 0 && m.ProjectPriceId == 0).CountAsync();
+            if (count <= 0)
+            {
+                await _projectConfigRepository.InsertAsync(new ProjectConfigEntity()
+                {
+                    ProjectId = 0,
+                    ProjectPriceId = 0,
+                    DrawRatio = 5,
+                    EffectDate = DateTime.Today,
+                    Status = 1
+                });
+            }
+        }
         #endregion
     }
 }

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2589,7 +2589,7 @@
         </member>
         <member name="P:ZhonTai.Admin.Domain.Notice.NoticeEntity.IsAlter">
             <summary>
-            是否首页弹窗 1弹窗 0不弹窗(只有一个)
+            是否首页弹窗 1弹窗(只有一个) 0不弹窗
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Domain.Notice.NoticeEntity.Tags">
@@ -6512,6 +6512,12 @@
             <param name="ids"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Services.Notice.NoticeService.GetWeightAsync">
+            <summary>
+            查询弹窗模块
+            </summary>        
+            <returns></returns>
+        </member>
         <member name="T:ZhonTai.Admin.Services.OprationLog.Dto.OprationLogAddInput">
             <summary>
             添加
@@ -8010,6 +8016,12 @@
             </summary>
             <param name="effectDate"></param>
         </member>
+        <member name="M:ZhonTai.Admin.Services.Project.ProjectPriceService.ProjectPriceInitAsync">
+            <summary>
+            初始化公司抽成信息
+            </summary>        
+            <returns></returns>
+        </member>
         <member name="T:ZhonTai.Admin.Services.Project.ProjectService">
             <summary>
             项目服务