修复门店目标服务：优化BatchCreateByStores方法，修复GetList排序参数问题；更新日报服务：添加开单业绩、退款业绩、实际业绩字段

“wangming”
1 parent 107c7d61
Showing 4 changed files with 57 additions and 31 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqMdGeneralManagerLifelineService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqMdTargetService.cs
netcore/src/Modularity/Extend/NCC.Extend/Utils/WeChatBotService.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
@@ -66,7 +66,7 @@ namespace NCC.Extend.LqMdGeneralManagerLifeline
         [HttpGet("")]
         public async Task<dynamic> 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<LqMdGeneralManagerLifelineEntity>()
                 .WhereIF(!string.IsNullOrEmpty(input.storeId), p => p.StoreId.Contains(input.storeId))
                 .WhereIF(!string.IsNullOrEmpty(input.month), p => p.Month == input.month)
@@ -67,7 +67,8 @@ namespace NCC.Extend.LqMdTarget
         [HttpGet("")]
         public async Task<dynamic> 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<LqMdTargetEntity>()
                 .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<LqMdTargetListOutput>.SqlSugarPageResult(data);
         }
@@ -151,43 +152,67 @@ namespace NCC.Extend.LqMdTarget
         public async Task<dynamic> 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<LqMdxxEntity>().Where(p => p.Status == StatusEnum.有效.GetHashCode()).Select(p => p.Id).ToListAsync();
+            var storeList = await _db.Queryable<LqMdxxEntity>().Select(p => p.Id).ToListAsync();
+
+            if (storeList == null || storeList.Count == 0)
+            {
+                return new { success = true, message = "没有有效的门店数据", createdCount = 0 };
+            }
+
             // 删除设置月份的所有门店数据
             await _db.Deleteable<LqMdTargetEntity>().Where(p => p.Month == month).ExecuteCommandAsync();
+
             // 批量创建
-            var entities = storeList.Select(storeId => new LqMdTargetEntity
+            var entities = new List<LqMdTargetEntity>();
+            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
@@ -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,