diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs index e525506..e204504 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs @@ -236,7 +236,7 @@ namespace NCC.Extend ), 0) as BillingPerformance, -- 退款业绩总和(退卡业绩) COALESCE(( - SELECT SUM(refund.tkje) + SELECT SUM(refund.F_ActualRefundAmount) FROM lq_hytk_hytk refund WHERE refund.md = store.F_Id AND refund.F_IsEffective = 1 diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdGeneralManagerLifelineService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdGeneralManagerLifelineService.cs index 5c38b7e..3189ddf 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdGeneralManagerLifelineService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdGeneralManagerLifelineService.cs @@ -66,7 +66,7 @@ namespace NCC.Extend.LqMdGeneralManagerLifeline [HttpGet("")] public async Task GetList([FromQuery] LqMdGeneralManagerLifelineListQueryInput input) { - var sidx = input.sidx == null ? "F_Id" : input.sidx; + var sidx = input.sidx == null ? "id" : input.sidx; var data = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(input.storeId), p => p.StoreId.Contains(input.storeId)) .WhereIF(!string.IsNullOrEmpty(input.month), p => p.Month == input.month) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdTargetService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdTargetService.cs index 11806c3..6723656 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdTargetService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdTargetService.cs @@ -67,7 +67,8 @@ namespace NCC.Extend.LqMdTarget [HttpGet("")] public async Task GetList([FromQuery] LqMdTargetListQueryInput input) { - var sidx = input.sidx == null ? "F_Id" : input.sidx; + var sidx = input.sidx == null ? "id" : input.sidx; + var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort; var data = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(input.storeId), p => p.StoreId.Contains(input.storeId)) .WhereIF(!string.IsNullOrEmpty(input.month), p => p.Month == input.month) @@ -102,7 +103,7 @@ namespace NCC.Extend.LqMdTarget updateUser = it.UpdateUser, }) .MergeTable() - .OrderBy(sidx + " " + input.sort) + .OrderBy($"{sidx} {sort}") .ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(data); } @@ -151,43 +152,67 @@ namespace NCC.Extend.LqMdTarget public async Task BatchCreateByStores([FromQuery] string month) { var userInfo = await _userManager.GetUserInfo(); + if (userInfo == null || string.IsNullOrEmpty(userInfo.userId)) + { + throw NCCException.Oh("用户信息获取失败,请重新登录"); + } // 验证月份格式 if (string.IsNullOrEmpty(month) || month.Length != 6 || !Regex.IsMatch(month, @"^\d{6}$")) { - throw NCCException.Oh(ErrorCode.COM1000, "月份格式必须为YYYYMM(如:202501)"); + throw NCCException.Oh("月份格式必须为YYYYMM(如:202501)"); } //查询门店列表 - var storeList = await _db.Queryable().Where(p => p.Status == StatusEnum.有效.GetHashCode()).Select(p => p.Id).ToListAsync(); + var storeList = await _db.Queryable().Select(p => p.Id).ToListAsync(); + + if (storeList == null || storeList.Count == 0) + { + return new { success = true, message = "没有有效的门店数据", createdCount = 0 }; + } + // 删除设置月份的所有门店数据 await _db.Deleteable().Where(p => p.Month == month).ExecuteCommandAsync(); + // 批量创建 - var entities = storeList.Select(storeId => new LqMdTargetEntity + var entities = new List(); + foreach (var storeId in storeList) + { + if (string.IsNullOrEmpty(storeId)) + continue; + + entities.Add(new LqMdTargetEntity + { + Id = YitIdHelper.NextId().ToString(), + StoreId = storeId, + Month = month, + BusinessUnit = "", + TechDepartment = "", + EducationDepartment = "", + MajorProjectDepartment = "", + BusinessUnitTarget = 0, + TechDepartmentTarget = 0, + EducationDepartmentTarget = 0, + BusinessUnitGeneralManager = "", + BusinessUnitManager = "", + StoreTarget = 0, + StoreLifeline = 0, + StoreConsumeTarget = 0, + StoreProjectTarget = 0, + StoreHeadcountTarget = 0, + AssistantHeadcountTargetStage1 = 0, + AssistantHeadcountTargetStage2 = 0, + CreateTime = DateTime.Now, + CreateUser = userInfo.userId, + }); + } + + if (entities.Count == 0) { - Id = YitIdHelper.NextId().ToString(), - StoreId = storeId, - Month = month, - BusinessUnit = "", - TechDepartment = "", - EducationDepartment = "", - MajorProjectDepartment = "", - BusinessUnitTarget = 0, - TechDepartmentTarget = 0, - EducationDepartmentTarget = 0, - BusinessUnitGeneralManager = "", - BusinessUnitManager = "", - StoreTarget = 0, - StoreLifeline = 0, - StoreConsumeTarget = 0, - StoreProjectTarget = 0, - StoreHeadcountTarget = 0, - AssistantHeadcountTargetStage1 = 0, - AssistantHeadcountTargetStage2 = 0, - CreateTime = DateTime.Now, - CreateUser = userInfo.userId, - }).ToList(); + return new { success = true, message = "没有有效的门店数据可创建", createdCount = 0 }; + } + var isOk = await _db.Insertable(entities).ExecuteCommandAsync(); if (!(isOk > 0)) - throw NCCException.Oh(ErrorCode.COM1000); + throw NCCException.Oh(ErrorCode.COM1000, "批量创建失败"); return new { success = true, message = $"成功创建{isOk}条记录", createdCount = isOk }; } #endregion diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotService.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotService.cs index 0df2a6e..6c15605 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotService.cs @@ -36,7 +36,8 @@ namespace NCC.Extend.Utils { var requestData = new { - webhookUrl = WEBHOOK_URL, + // webhookUrl = WEBHOOK_URL, + webhookUrl = WEBHOOK_URL_TEST, content = content, mentionedList = (string)null, mentionedMobileList = (string)null,