diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs index 7b141a3..0969449 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs @@ -122,10 +122,15 @@ namespace NCC.Extend.LqKdKdjlb } var output = entity.Adapt(); + if (output.activityId != null) + { + output.activityName = await _db.Queryable().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync(); + } //获取会员信息 var MemberInfo = await _db.Queryable().FirstAsync(p => p.Id == entity.Kdhy); output.kdhyc = MemberInfo.Khmc; output.kdhysjh = MemberInfo.Sjh; + if (!string.IsNullOrEmpty(entity.ActivityId)) { output.activityName = await _db.Queryable().Where(x => x.Id == entity.ActivityId).Select(x => x.ActivityName).FirstAsync(); @@ -2081,10 +2086,7 @@ namespace NCC.Extend.LqKdKdjlb // 查询开单记录 var billingRecords = await _db.Queryable() - .Where(w => w.Djmd == input.StoreId - && w.Kdrq >= input.StartTime - && w.Kdrq <= input.EndTime - && w.IsEffective == StatusEnum.有效.GetHashCode()) + .Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode()) .Select(it => new { id = it.Id, @@ -2095,8 +2097,8 @@ namespace NCC.Extend.LqKdKdjlb zdyj = it.Zdyj, sfyj = it.Sfyj, qk = it.Qk, - kdhyc = it.Kdhyc, - kdhysjh = it.Kdhysjh, + kdhyc = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc), + kdhysjh = SqlFunc.Subqueryable().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh), fkfs = it.Fkfs, // 付款方式 khly = it.Khly, // 客户来源 bz = it.Bz, // 备注 diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs index e439ea8..12f8fc7 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs @@ -820,7 +820,7 @@ namespace NCC.Extend.LqTkjlb -- 邀约信息 yaoy.F_Id as yaoy_id, -- 邀约ID yaoy.F_CreateTime as yaoy_time, -- 邀约时间 - yaoy.F_Status as yaoy_status, -- 邀约状态 + yaoy.yysj as yaoy_appointment_time, -- 邀约时间 -- 预约信息 yy.F_Id as yy_id, -- 预约ID yy.F_Status as yy_status, -- 预约状态 @@ -862,10 +862,10 @@ namespace NCC.Extend.LqTkjlb LEFT JOIN ( SELECT hy as member_id, - SUM(xfje) as total_consume_amount, + SUM(COALESCE(xfje, 0)) as total_consume_amount, COUNT(*) as consume_count, - MIN(F_CreateTime) as first_consume_time, - MAX(F_CreateTime) as last_consume_time + MIN(hksj) as first_consume_time, + MAX(hksj) as last_consume_time FROM lq_xh_hyhk WHERE F_IsEffective = 1 GROUP BY hy @@ -873,11 +873,11 @@ namespace NCC.Extend.LqTkjlb LEFT JOIN ( SELECT kdhy as member_id, - SUM(sfyj) as total_billing_amount, - SUM(qk) as total_debt_amount, + SUM(COALESCE(sfyj, 0)) as total_billing_amount, + SUM(COALESCE(qk, 0)) as total_debt_amount, COUNT(*) as billing_count, - MIN(F_CreateTime) as first_billing_time, - MAX(F_CreateTime) as last_billing_time + MIN(kdrq) as first_billing_time, + MAX(kdrq) as last_billing_time FROM lq_kd_kdjlb WHERE F_IsEffective = 1 GROUP BY kdhy diff --git a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs index d8a0b98..4fb8646 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/Utils/LqKdKdjlbStringGenerator.cs @@ -51,6 +51,7 @@ namespace NCC.Extend.Utils sb.AppendLine($"⏩健康师:{string.Join("、", healthTeachers)}"); // 活动方案:532工程 + sb.AppendLine($"⏩活动方案:{entity.activityName ?? "无"}"); // sb.AppendLine($"⏩活动方案:{entity.pxxx ?? "无"}"); // 跟单配合:王经理 竹主任 陈思思老师 var techTeachers = GetTechTeachers(entity.lqKdKjbsyjList);