From 2b62ac372e0387749387f9175d3621ae6ae19554 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 14 Jan 2025 14:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=85=A5=E8=AE=A1=E7=AE=97=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/scmvehrebate/ScmVehRebateService.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index ea04881781..41b072de7c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -670,8 +670,22 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     BigDecimal rule = new BigDecimal(info.getCalculationStandard());
                     if (calculationModeValue.equals("比例")) {
                         scmVehRebate.setCalculationModeKey("001");
-                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());
-                        BigDecimal m = rule.multiply(costPrice).divide(new BigDecimal("100"));
+                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());// 入库价
+                        BigDecimal freight = BigDecimal.ZERO; //运费
+                        BigDecimal topAmount = BigDecimal.ZERO; //上装金额
+                        BigDecimal money = BigDecimal.ZERO; //基数
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getFreight())) {
+                            freight = new BigDecimal(baseVehicleRebateVo.getFreight());
+                        }
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getTopAmount())) {
+                            topAmount = new BigDecimal(baseVehicleRebateVo.getTopAmount());
+                        }
+                        if (topAmount.compareTo(BigDecimal.ZERO) > 0 && baseVehicleRebateVo.getBrandName().contains("陕汽")) {
+                            money = costPrice.subtract(freight).subtract(topAmount);
+                        } else {
+                            money = costPrice.subtract(freight);
+                        }
+                        BigDecimal m = rule.multiply(money).divide(new BigDecimal("100"));
                         scmVehRebate.setEstimateRebate(m.toString());
                     } else {
                         scmVehRebate.setCalculationModeKey("002");