From 2b62ac372e0387749387f9175d3621ae6ae19554 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 14 Jan 2025 14:10:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5=E8=AE=A1=E7=AE=97=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A1=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");

From a4f1f5678acc9fbcd87341aca05a8691d1374ac5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 14 Jan 2025 14:55:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=B7=AE=E5=BC=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../differenceManagement/differenceManagement.vue               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue
index 8ecbb80af7..2475afe7cf 100644
--- a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue
@@ -313,7 +313,7 @@ export default {
           loading.close()
           if (resp.success) {
             this.$message({ type: 'success', message: resp.msg, showClose: true })
-            this.loadList()
+            this.getList()
           }
         }).catch((e) => {
           loading.close()

From 0fa4f68de083f02aec9cff4d3ab71287cf1d9687 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 14 Jan 2025 15:24:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=B7=AE=E5=BC=82=E8=B0=83=E6=95=B4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../differentialAdjustment/differentialAdjustment.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue
index 966703747e..691eb36d98 100644
--- a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue
@@ -53,7 +53,8 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="180" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
-            <el-table-column prop="uploadMoney" label="差额" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
+            <el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="120" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
           </el-table>