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