From fe6292ca1b42ec2b5db19de6e02cbb3229059b08 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 11 Feb 2026 10:33:57 +0800 Subject: [PATCH] =?UTF-8?q?2026-02-11=20=E7=A7=BB=E9=99=A4=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=90=8C=E6=AD=A5=20markup=20=E5=88=B0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quote/service/impl/QuoteServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java index 027bd83e..90021f94 100644 --- a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java +++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java @@ -173,16 +173,20 @@ public class QuoteServiceImpl extends ServiceImpl implements checkCurrency(quote); quote.setUpdateDate(new Date()); updateById(quote); - quoteGroupDetailService.lambdaUpdate() - .set(QuoteGroupDetail::getProfitRate, quote.getMarkup()) - .set(QuoteGroupDetail::getQuoteProfitRate, quote.getMarkup()) - .eq(QuoteGroupDetail::getQuoteId,quote.getId()) - .update(); - quoteDetailService.lambdaUpdate() - .set(QuoteDetail::getProfitRate, quote.getMarkup()) - .set(QuoteDetail::getQuoteProfitRate, quote.getMarkup()) - .eq(QuoteDetail::getQuoteId,quote.getId()) - .update(); + // 移除强制同步 markup 到明细的逻辑，因为： + // 1. 主表 markup 只应作为创建明细时的默认值 + // 2. 明细的 quoteProfitRate(VA%) 由用户单独设置，不应被覆盖 + // 3. 原逻辑会导致用户设置的 VA 被清零 +// quoteGroupDetailService.lambdaUpdate() +// .set(QuoteGroupDetail::getProfitRate, quote.getMarkup()) +// .set(QuoteGroupDetail::getQuoteProfitRate, quote.getMarkup()) +// .eq(QuoteGroupDetail::getQuoteId,quote.getId()) +// .update(); +// quoteDetailService.lambdaUpdate() +// .set(QuoteDetail::getProfitRate, quote.getMarkup()) +// .set(QuoteDetail::getQuoteProfitRate, quote.getMarkup()) +// .eq(QuoteDetail::getQuoteId,quote.getId()) +// .update(); } @Override