Merge remote-tracking branch 'origin/master'

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");

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()

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>