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

src/platform/ZhonTai.Admin/Services/Project/Dto/ProjectGetPageOutput.cs

@@ -24,10 +24,11 @@ namespace ZhonTai.Admin.Services.Project.Dto
         /// <summary>
         /// 结算周期
         /// </summary>
-        public int SettleDay { get; set; }        
+        public int SettleDay { get; set; }
         /// <summary>
-        /// 状态 0待上架 1上架 2下架 3暂停
+        /// 状态 1待上架 2上架 3下架 4暂停 5名额已满
         /// </summary>
-        public string Status { get; set; }        
+        public int Status { get; set; }
+        public string StatusText { get; set; }
     }
 }

src/platform/ZhonTai.Admin/Services/Project/Dto/ProjectUpdateStatusInput.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZhonTai.Admin.Services.Project.Dto
+{
+    public class ProjectUpdateStatusInput
+    {
+        public long Id { get; set; }
+        public int status { get; set; }        
+    }
+}

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

@@ -94,6 +94,10 @@ namespace ZhonTai.Admin.Services.Project
             .Page(input.CurrentPage, input.PageSize)
             .ToListAsync<ProjectGetPageOutput>();
 
+            list.ForEach(item => { 
+                item.StatusText= GetStatusText(item.Status);
+            });
+
             var data = new PageOutput<ProjectGetPageOutput>()
             {
                 List = Mapper.Map<List<ProjectGetPageOutput>>(list),
@@ -213,22 +217,22 @@ namespace ZhonTai.Admin.Services.Project
         /// </summary>
         ///<param name="Id"></param>
         ///<param name="status">状态 2上架 3下架 4暂停</param>
-        /// <returns></returns>
-        public async Task UpdateStatusAsync(long Id, int status)
+        /// <returns></returns>        
+        public async Task UpdateStatusAsync(ProjectUpdateStatusInput input)
         {
-            var project = await _projectRepository.GetAsync(Id);
+            var project = await _projectRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.Id == input.Id).ToOneAsync();
             if (!(project?.Id > 0))
             {
                 throw ResultOutput.Exception("项目不存在");
             }
-            if (!new int[] { 2, 3, 4, 5 }.Contains(status))
+            if (!new int[] { 2, 3, 4, 5 }.Contains(input.status))
             {
                 throw ResultOutput.Exception("请做出有效操作");
             }
             //上架项目需要验证推广码是否大于0
-            if (status == 2)
+            if (input.status == 2)
             {
-                var count = await _projectLinkRepository.Where(m => m.ProjectId == Id && m.IsUse == 0).CountAsync();
+                var count = await _projectLinkRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.ProjectId == input.Id && m.IsUse == 0).CountAsync();
                 if (count <= 0)
                 {
                     throw ResultOutput.Exception("请去上传推广码");
@@ -238,7 +242,7 @@ namespace ZhonTai.Admin.Services.Project
 
 
             string statusText = GetStatusText(project.Status);
-            string statusText2 = GetStatusText(status);
+            string statusText2 = GetStatusText(input.status);
 
             string remark = $"{project.Name}从{statusText}变更为{statusText2}";
 
@@ -247,16 +251,16 @@ namespace ZhonTai.Admin.Services.Project
             new ProjectEntity()
             {
                 Id = project.Id,
-                Status = status,
+                Status = input.status,
             })
-            .UpdateColumns(a => new { a.Status }).ExecuteAffrowsAsync();
+            .UpdateColumns(a => new { a.Status })..DisableGlobalFilter(FilterNames.Tenant).ExecuteAffrowsAsync();
 
             //项目记录
             await _projectRecordRepository.InsertAsync(new ProjectRecordEntity()
             {
-                ProjectId = Id,
+                ProjectId = input.Id,
                 Remark = remark,
-                Type = status,
+                Type = input.status,
             });
         }
 
@@ -269,7 +273,7 @@ namespace ZhonTai.Admin.Services.Project
         {
             var list = await _projectRepository.Select
                 .DisableGlobalFilter(FilterNames.Tenant)
-            .ToListAsync<ProjectSelectOutput>();
+            .ToListAsync<ProjectSelectOutput>();           
 
             return list;
         }