diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java index d8b13d941e..9d2fb586f1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java +++ b/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("二次待支付费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index 539ed10746..2f6fca4d14 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/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("二次待支付费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java index 2e7759e020..c32359bcd3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java +++ b/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("二次待支付费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java index 3d742aaae3..1a7490da97 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java +++ b/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("二次待支付费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java index c5fe1ed37e..08627f6519 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java +++ b/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("二次抵顶费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index 512445b1ef..ed93247427 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/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("使用组织名称") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java index 6122aefad6..7b9259fa4d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java +++ b/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("二次抵顶费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java index e234643366..a9971a6f55 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java +++ b/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("二次抵顶费用") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java index 204e187f83..4dd5aeac73 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java +++ b/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") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index dadd2468c3..b469099b3e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/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