From 1b4a73cd2581b9ba352e4d90df66948f7d47ec5b Mon Sep 17 00:00:00 2001 From: van Date: Sun, 5 Apr 2026 23:13:47 +0800 Subject: [PATCH] 1 --- .../java/com/ruoyi/jarvis/service/IJDOrderProfitService.java | 1 + .../ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderProfitService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderProfitService.java index 1203f68..f0dfd39 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderProfitService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderProfitService.java @@ -9,6 +9,7 @@ public interface IJDOrderProfitService { /** * 根据分销标识、型号配置、手动标记等，填充售价（自动时）并计算利润。 + * F 单：利润 = 对客实收（直款=售价，闲鱼=扣点后的到账）-（下单付款 - 后返金额）。 * 会修改传入的 {@code order}。 */ void recalculate(JDOrder order); diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java index b57005e..f0ff391 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java @@ -98,7 +98,10 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService { order.setProfit(null); return; } - order.setProfit(BigDecimal.valueOf(netReceipt - pay - rebate) + // 成本 = 下单付款 - 后返金额；利润 = 对客实收（直款=售价，闲鱼=扣点后的到账）- 成本 + double cost = BigDecimal.valueOf(pay).subtract(BigDecimal.valueOf(rebate)) + .setScale(2, RoundingMode.HALF_UP).doubleValue(); + order.setProfit(BigDecimal.valueOf(netReceipt - cost) .setScale(2, RoundingMode.HALF_UP).doubleValue()); } }