Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java

@@ -138,6 +138,25 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
         IPage<CarsSoldProfitVo> pagging = baseMapper.listPage(page, qw);
         List<CarsSoldProfitVo> recordList = pagging.getRecords();
         recordList.removeAll(Collections.singleton(null));
+        if(!recordList.isEmpty()){
+            for (int i = 0; i < recordList.size(); i++) {
+                CarsSoldProfitVo carsSoldProfitVo = recordList.get(i);
+                //预计毛利=出库价-成本+服务费+返利-中介费-调车费
+                BigDecimal expectedMaoriBig = BigDecimal.ZERO;
+                String vinSid = carsSoldProfitVo.getVinSid();
+                CarsSoldProfitRebateAllVo carsSoldProfitRebateAllVo = rebates(vinSid).getData();
+                if(carsSoldProfitRebateAllVo != null){
+                    String expectedRebateTotal = carsSoldProfitRebateAllVo.getExpectedRebateTotal();
+                    carsSoldProfitVo.setRebatesTotal(expectedRebateTotal);
+                }
+                if(StringUtils.isNotBlank(carsSoldProfitVo.getExStockPrice())){
+                    expectedMaoriBig = expectedMaoriBig.add(new BigDecimal(carsSoldProfitVo.getExStockPrice()));
+                }
+
+
+
+            }
+        }
         PagerVo<CarsSoldProfitVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -158,20 +177,20 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
                 carsSoldProfitRebateDetailsVo.setRebateType(scmVehRebateCarsSoldProfitVo.getRebateTypeValue());
                 carsSoldProfitRebateDetailsVo.setYearAndMonth(scmVehRebateCarsSoldProfitVo.getPalceGenDate());
                 carsSoldProfitRebateDetailsVo.setRebateName(scmVehRebateCarsSoldProfitVo.getRebateName());
-                carsSoldProfitRebateDetailsVo.setExpectedRebate(scmVehRebateCarsSoldProfitVo.getExpectedRebate());
+                carsSoldProfitRebateDetailsVo.setExpectedRebate(scmVehRebateCarsSoldProfitVo.getEstimateRebate());
                 carsSoldProfitRebateDetailsVo.setRebatesAdjust(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney());
                 list.add(carsSoldProfitRebateDetailsVo);
-                if (StringUtils.isNotBlank(carsSoldProfitRebateDetailsVo.getExpectedRebate())) {
+                if (StringUtils.isNotBlank(scmVehRebateCarsSoldProfitVo.getEstimateRebate())) {
-                    expectedRebateTotalAll.add(new BigDecimal(carsSoldProfitRebateDetailsVo.getExpectedRebate()));
+                    expectedRebateTotalAll = expectedRebateTotalAll.add(new BigDecimal(scmVehRebateCarsSoldProfitVo.getEstimateRebate()));
                 }
-                if (StringUtils.isNotBlank(carsSoldProfitRebateDetailsVo.getRebatesAdjust())) {
+                if (StringUtils.isNotBlank(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney())) {
-                    adjustedRebateTotalAll.add(new BigDecimal(carsSoldProfitRebateDetailsVo.getRebatesAdjust()));
+                    adjustedRebateTotalAll = adjustedRebateTotalAll.add(new BigDecimal(scmVehRebateCarsSoldProfitVo.getAdjustmentMoney()));
                 }
             }
         }
         carsSoldProfitRebateAllVo.setList(list);
         carsSoldProfitRebateAllVo.setAdjustedRebateTotal(adjustedRebateTotalAll.toString());
-        carsSoldProfitRebateAllVo.setExpectedRebateTotal(adjustedRebateTotalAll.toString());
+        carsSoldProfitRebateAllVo.setExpectedRebateTotal(expectedRebateTotalAll.toString());
         return rb.success().setData(carsSoldProfitRebateAllVo);
     }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateCarsSoldProfitVo.java

@@ -22,7 +22,7 @@ public class ScmVehRebateCarsSoldProfitVo implements Vo {
     @ApiModelProperty("返利名称")
     private String rebateName;
     @ApiModelProperty("预提返利:预提返利-预提费用的结果（待支付+抵顶）")
-    private String expectedRebate;
+    private String estimateRebate;
     @ApiModelProperty("预计待支付费用")
     private String expectTreatCost;
     @ApiModelProperty("预计抵顶费用")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -2726,7 +2726,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if(!list.isEmpty()){
             for (int i = 0; i < list.size(); i++) {
                 ScmVehRebateCarsSoldProfitVo scmVehRebateCarsSoldProfitVo = list.get(i);
-                String expectedRebate = scmVehRebateCarsSoldProfitVo.getExpectedRebate();
+                String expectedRebate = scmVehRebateCarsSoldProfitVo.getEstimateRebate();
                 BigDecimal expectAll = BigDecimal.ZERO;
                 String expectTreatCost = scmVehRebateCarsSoldProfitVo.getExpectTreatCost();
                 String expectSuppCost = scmVehRebateCarsSoldProfitVo.getExpectSuppCost();
@@ -2739,7 +2739,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 if(StringUtils.isNotBlank(expectSuppCost)){
                     expectAll = expectAll.subtract(new BigDecimal(expectSuppCost));
                 }
-                scmVehRebateCarsSoldProfitVo.setExpectedRebate(expectAll.toString());
+                scmVehRebateCarsSoldProfitVo.setEstimateRebate(expectAll.toString());
 
             }
         }