CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-05-16 22:03:59 +08:00
parent 746be8c633
commit 17ec7fa131
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java
View File

@@ -173,6 +173,10 @@ public class JDOrder extends BaseEntity {
/** 利润是否手动锁定（1 是：保存时不再自动重算） */
private Integer profitManual;
/** 额外成本（计入自动利润：从 netReceipt − 成本中再减去此项，默认 0） */
@Excel(name = "额外成本")
private Double extraCost;
}

16
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderProfitServiceImpl.java
View File

@@ -46,7 +46,7 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService {
if ("H-TF".equals(mark)) {
if (!profitLocked) {
// 与 F 单一致：利润 = 对客实收 − (下单付款 − 后返)。列表未填售价时默认直款并从型号配置取价。
// 与 F 单一致：利润 = 对客实收 − (下单付款 − 后返) − 额外成本。列表未填售价时默认直款并从型号配置取价。
String type = order.getSellingPriceType();
if (type == null || type.isEmpty()) {
order.setSellingPriceType("direct");
@@ -61,7 +61,9 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService {
} else {
String buyer = order.getBuyer();
boolean fan = buyer != null && buyer.trim().startsWith("凡-");
order.setProfit(fan ? 65.0 : 15.0);
double base = fan ? 65.0 : 15.0;
order.setProfit(BigDecimal.valueOf(base - extraCostOrZero(order))
.setScale(2, RoundingMode.HALF_UP).doubleValue());
}
}
return;
@@ -127,13 +129,19 @@ public class JDOrderProfitServiceImpl implements IJDOrderProfitService {
order.setProfit(null);
return;
}
// 成本 = 下单付款 - 后返金额；利润 = 对客实收（直款=售价，闲鱼=扣点后的到账）- 成本
// 成本 = 下单付款 - 后返金额；利润 = 对客实收 − 成本 − 额外成本
double cost = BigDecimal.valueOf(pay).subtract(BigDecimal.valueOf(rebate))
.setScale(2, RoundingMode.HALF_UP).doubleValue();
order.setProfit(BigDecimal.valueOf(netReceipt - cost)
double net = netReceipt - cost - extraCostOrZero(order);
order.setProfit(BigDecimal.valueOf(net)
.setScale(2, RoundingMode.HALF_UP).doubleValue());
}
private static double extraCostOrZero(JDOrder order) {
Double e = order == null ? null : order.getExtraCost();
return e != null ? e : 0.0;
}
@Override
public int syncAutoProfitIfChanged(List<Long> ids) {
if (ids == null || ids.isEmpty()) {