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 acc275c..3239f52 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 @@ -69,18 +69,18 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService { return; } - if ("F".equals(mark) || mark.startsWith("F-")) { - if (!sellingLocked) { - fillSellingPriceFromConfig(order); - } - if (!profitLocked) { - computeProfitForF(order); - } - return; + // 其余分销标记:与 F / F-* / PDD / H / … 共用同一利润公式(含额外成本);须有售价渠道 + 售价才自动算出利润,否则清空 + if (!sellingLocked) { + fillSellingPriceFromConfig(order); } - if (!profitLocked) { - order.setProfit(null); + String type = order.getSellingPriceType(); + Double sp = order.getSellingPrice(); + if (type != null && !type.trim().isEmpty() && sp != null) { + computeProfitForF(order); + } else { + order.setProfit(null); + } } }