1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java

@@ -114,6 +114,12 @@ public class ScmSpecialRebate extends BaseEntity {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时支出费用")
+    private BigDecimal tempItureCost;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次支出费用")
     private BigDecimal secondItureCost;
     @ApiModelProperty("二次待支付费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -130,6 +130,12 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时支出费用")
+    private BigDecimal tempItureCost;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次支出费用")
     private BigDecimal secondItureCost;
     @ApiModelProperty("二次待支付费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@@ -125,6 +125,12 @@ public class ScmSpecialRebateDto implements Dto {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时支出费用")
+    private BigDecimal tempItureCost;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次支出费用")
     private BigDecimal secondItureCost;
     @ApiModelProperty("二次待支付费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java

@@ -47,6 +47,12 @@ public class ScmSpecialRebateSpecialAdjDto implements Dto {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时支出费用")
+    private BigDecimal tempItureCost;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次支出费用")
     private BigDecimal secondItureCost;
     @ApiModelProperty("二次待支付费用")

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

@@ -128,6 +128,10 @@ public class ScmVehRebate extends BaseEntity {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次待支付费用")
     private BigDecimal secondTreatCost;
     @ApiModelProperty("二次抵顶费用")

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

@@ -144,6 +144,10 @@ public class ScmVehRebateDetailsVo implements Vo {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次待支付费用")
     private BigDecimal secondTreatCost;
     @ApiModelProperty("二次抵顶费用")
@@ -151,6 +155,11 @@ public class ScmVehRebateDetailsVo implements Vo {
     @ApiModelProperty("二次抵顶费用说明")
     private String secondSuppRemark;
 
+    @ApiModelProperty("待支付费用调整金额")
+    private BigDecimal treatAdjustmentMoney;
+    @ApiModelProperty("抵顶费用调整金额")
+    private BigDecimal suppAdjustmentMoney;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

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

@@ -45,6 +45,10 @@ public class ScmVehRebateVehAdjDto implements Dto {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次待支付费用")
     private BigDecimal secondTreatCost;
     @ApiModelProperty("二次抵顶费用")

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

@@ -131,6 +131,10 @@ public class ScmVehRebateVehDto implements Dto {
     private BigDecimal onceSuppCost;
     @ApiModelProperty("一次抵顶费用说明")
     private String onceSuppRemark;
+    @ApiModelProperty("临时待支付费用")
+    private BigDecimal tempTreatCost;
+    @ApiModelProperty("临时抵顶费用")
+    private BigDecimal tempSuppCost;
     @ApiModelProperty("二次待支付费用")
     private BigDecimal secondTreatCost;
     @ApiModelProperty("二次抵顶费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java

@@ -75,6 +75,8 @@ public class ScmVehrebateCheckapplydetailDetailsVo implements Vo {
     private String stayDetermineMoney; // 待确定金额
     @ApiModelProperty("调整金额")
     private String adjustmentMoney; // 调整金额
+    @ApiModelProperty("费用调整金额")
+    private String fyAdjustmentMoney;
     @ApiModelProperty("费用")
     private String money; // 费用
 	@ApiModelProperty("单车返利sid")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -360,6 +360,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         scmSpecialRebateDto.setOnceTreatCost(dto.getOnceTreatCost());
         scmSpecialRebateDto.setOnceSuppCost(dto.getOnceSuppCost());
         scmSpecialRebateDto.setOnceSuppRemark(dto.getOnceSuppRemark());
+        scmSpecialRebateDto.setTempItureCost(scmSpecialRebate.getOnceItureCost().subtract(scmSpecialRebate.getTempItureCost()).add(dto.getTempItureCost()));
+        scmSpecialRebateDto.setTempTreatCost(scmSpecialRebate.getOnceTreatCost().subtract(scmSpecialRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
+        scmSpecialRebateDto.setTempSuppCost(scmSpecialRebate.getOnceSuppCost().subtract(scmSpecialRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
         scmSpecialRebateDto.setSecondItureCost(dto.getSecondItureCost());
         scmSpecialRebateDto.setSecondTreatCost(dto.getSecondTreatCost());
         scmSpecialRebateDto.setSecondSuppCost(dto.getSecondSuppCost());

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

@@ -477,6 +477,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         ScmVehRebateDetailsVo vo = new ScmVehRebateDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setWithholdCost(vo.getExpectTreatCost().add(vo.getExpectSuppCost()));
+        vo.setTreatAdjustmentMoney(vo.getOnceTreatCost().add(vo.getSecondTreatCost()).subtract(vo.getExpectTreatCost()));
+        vo.setSuppAdjustmentMoney(vo.getOnceSuppCost().add(vo.getSecondSuppCost()).subtract(vo.getExpectSuppCost()));
         return vo;
     }
 
@@ -529,6 +531,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         scmVehRebateVehDto.setOnceTreatCost(dto.getOnceTreatCost());
         scmVehRebateVehDto.setOnceSuppCost(dto.getOnceSuppCost());
         scmVehRebateVehDto.setOnceSuppRemark(dto.getOnceSuppRemark());
+        scmVehRebateVehDto.setTempTreatCost(scmVehRebate.getOnceTreatCost().subtract(scmVehRebate.getTempTreatCost()).add(dto.getTempTreatCost()));
+        scmVehRebateVehDto.setTempSuppCost(scmVehRebate.getOnceSuppCost().subtract(scmVehRebate.getTempSuppCost()).add(dto.getTempSuppCost()));
         scmVehRebateVehDto.setSecondTreatCost(dto.getSecondTreatCost());
         scmVehRebateVehDto.setSecondSuppCost(dto.getSecondSuppCost());
         scmVehRebateVehDto.setSecondSuppRemark(dto.getSecondSuppRemark());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

@@ -30,7 +30,9 @@
                SUM(svc.`stayDetermineMoney`)                                                        stayDetermineMoney,
                SUM(svc.`adjustmentMoney`)                                                           adjustmentMoney,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
-               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        fyAdjustmentMoney
         FROM scm_vehrebate_checkapplydetail svc
         WHERE svc.`mainSid` = #{sid}
         GROUP BY svc.`rebateTypeKey`
@@ -47,7 +49,9 @@
                SUM(svc.`stayDetermineMoney`)                                                        stayDetermineMoney,
                SUM(svc.`adjustmentMoney`)                                                           adjustmentMoney,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
-               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        fyAdjustmentMoney
         FROM scm_vehrebate_checkapplydetail svc
         WHERE svc.`mainSid` = #{sid}
         GROUP BY svc.withholdingDate