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:
雷欧（林平凡）
2025-10-09 17:46:00 +08:00
parent 0ccc0ee995
commit 9b2c753cea
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -318,7 +318,7 @@ public class InstructionServiceImpl implements IInstructionService {
double rebateAmount = globalRebateAmounts.getOrDefault(model, 0.0); double rebateAmount = globalRebateAmounts.getOrDefault(model, 0.0);
int count = entry.getValue(); int count = entry.getValue();
// 计算单台价格（总付款金额 / 数量） // 计算单台价格（总付款金额 / 数量）用于显示
double singlePayment = count > 0 ? paymentAmount / count : 0.0; double singlePayment = count > 0 ? paymentAmount / count : 0.0;
double singleRebate = count > 0 ? rebateAmount / count : 0.0; double singleRebate = count > 0 ? rebateAmount / count : 0.0;
@@ -333,17 +333,18 @@ public class InstructionServiceImpl implements IInstructionService {
// 如果获取失败，佣金为0 // 如果获取失败，佣金为0
} }
// 计算净价（单台价格 - 返现 + 佣金） // 用总金额计算，避免精度损失：总价 = 总付款 - 总返现 + (佣金 × 数量)
double netPrice = singlePayment - singleRebate + commission; double totalPrice = paymentAmount - rebateAmount + (commission * count);
// 计算总价
double totalPrice = netPrice * count;
grandTotal += totalPrice; grandTotal += totalPrice;
// 计算净价用于显示（总价 / 数量）
double netPrice = count > 0 ? totalPrice / count : 0.0;
// 格式：单台价格-返现+佣金=净价×数量=总价 // 格式：单台价格-返现+佣金=净价×数量=总价
if (count == 1) { if (count == 1) {
// 数量为1时，不显示×1 // 数量为1时，不显示×1
calculationLines.append(String.format("%.1f-%.0f+%.0f=%.1f\n", calculationLines.append(String.format("%.1f-%.0f+%.0f=%.1f\n",
singlePayment, singleRebate, commission, netPrice)); singlePayment, singleRebate, commission, totalPrice));
} else { } else {
calculationLines.append(String.format("%.1f-%.0f+%.0f=%.1f×%d=%.1f\n", calculationLines.append(String.format("%.1f-%.0f+%.0f=%.1f×%d=%.1f\n",
singlePayment, singleRebate, commission, netPrice, count, totalPrice)); singlePayment, singleRebate, commission, netPrice, count, totalPrice));
@@ -364,9 +365,6 @@ public class InstructionServiceImpl implements IInstructionService {
double rebateAmount = globalRebateAmounts.getOrDefault(model, 0.0); double rebateAmount = globalRebateAmounts.getOrDefault(model, 0.0);
int count = entry.getValue(); int count = entry.getValue();
double singlePayment = count > 0 ? paymentAmount / count : 0.0;
double singleRebate = count > 0 ? rebateAmount / count : 0.0;
double commission = 0.0; double commission = 0.0;
try { try {
com.ruoyi.jarvis.domain.ProductJdConfig config = productJdConfigService.selectProductJdConfigByModel(model); com.ruoyi.jarvis.domain.ProductJdConfig config = productJdConfigService.selectProductJdConfigByModel(model);
@@ -376,8 +374,8 @@ public class InstructionServiceImpl implements IInstructionService {
} catch (Exception e) { } catch (Exception e) {
} }
double netPrice = singlePayment - singleRebate + commission; // 用总金额计算
double totalPrice = netPrice * count; double totalPrice = paymentAmount - rebateAmount + (commission * count);
if (i > 0) { if (i > 0) {
summaryFormula.append("+"); summaryFormula.append("+");