From e09804e2cb1d4459f3c141d43b3727cfe9d62773 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Wed, 5 Nov 2025 17:14:20 +0800 Subject: [PATCH] fix: 更新消耗服务相关代码 --- netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs index b16d3c4..5df76b8 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs @@ -136,6 +136,8 @@ namespace NCC.Extend.LqXhHyhk sourceType = pxmx.SourceType, totalPrice = pxmx.TotalPrice, isEffective = pxmx.IsEffective, + originalProjectNumber = pxmx.OriginalProjectNumber, + overtimeProjectNumber = pxmx.OvertimeProjectNumber }; // 关联该品项的健康师业绩 @@ -606,7 +608,7 @@ namespace NCC.Extend.LqXhHyhk entity.OvertimeCoefficient = input.overtimeCoefficient; entity.OriginalSgfy = input.sgfy; entity.OvertimeSgfy = (decimal)(entity.OvertimeCoefficient * input.sgfy); - entity.Sgfy = (decimal)(input.sgfy + (entity.OvertimeCoefficient * input.sgfy)); + entity.Sgfy = entity.OriginalSgfy + entity.OvertimeSgfy; //更新会员耗卡记录 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); @@ -660,10 +662,12 @@ namespace NCC.Extend.LqXhHyhk Yjsj = DateTime.Now, JsjId = ijks_tem.jsjId, Kdpxid = lqXhPxmxEntity.Id, - LaborCost = ijks_tem.laborCost, OriginalKdpxNumber = ijks_tem.kdpxNumber, OvertimeKdpxNumber = (decimal)(entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0)), KdpxNumber = (decimal)((ijks_tem.kdpxNumber ?? 0) + (entity.OvertimeCoefficient * (ijks_tem.kdpxNumber ?? 0))) + (ijks_tem.accompaniedProjectNumber ?? 0), + OvertimeLaborCost = (decimal)(entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)), + LaborCost = ijks_tem.laborCost + (entity.OvertimeCoefficient * (ijks_tem.laborCost ?? 0)), + OriginalLaborCost = ijks_tem.laborCost, IsEffective = StatusEnum.有效.GetHashCode(), IsAccompanied = ijks_tem.isAccompanied, AccompaniedProjectNumber = ijks_tem.accompaniedProjectNumber, -- libgit2 0.21.4