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 79e8aceb3c..539ed10746 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 @@ -139,6 +139,13 @@ public class ScmSpecialRebateDetailsVo implements Vo { @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; + @ApiModelProperty("支出费用调整金额") + private BigDecimal itureAdjustmentMoney; + @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/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java index b22323d37a..0f8f6cd254 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java @@ -73,6 +73,8 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo 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/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index 242d6bdfda..ac687072e3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -23,7 +23,10 @@ SUM(ssc.`adjustmentMoney`) adjustmentMoney, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + - ssc.secondTreatCost + ssc.secondSuppCost) AS money + ssc.secondTreatCost + ssc.secondSuppCost) AS money, + SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + + ssc.secondTreatCost + ssc.secondSuppCost) - + SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney FROM scm_specialrebate_checkapplydetail ssc WHERE ssc.`mainSid` = #{sid} GROUP BY ssc.`rebateTypeKey` diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java index b610045aa8..891c10c3a3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java @@ -76,6 +76,6 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String mainSid); - @Select("select * from scm_vehrebate_checkapplydetail where vehRebateSid = #{vehRebateSid}") - ScmVehRebateDetailsVo selByVehRebteSid(String vehRebateSid); + @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{mainSid}") + List selByVehRebteSid(String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java index 4c0978329a..e582a8cf80 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java @@ -63,41 +63,36 @@ import java.util.List; */ @Service public class ScmVehrebateCheckapplydetailService extends MybatisBaseService { - - public void insertByDto(ScmVehrebateCheckapplydetailDto dto){ - ScmVehrebateCheckapplydetail entity = new ScmVehrebateCheckapplydetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void delByMainSid(String sid) { - baseMapper.delByMainSid(sid); - } - public List fetchWhenDetailsVoBySid(String sid) { - return baseMapper.fetchWhenDetailsVoBySid(sid); - } + public void insertByDto(ScmVehrebateCheckapplydetailDto dto) { + ScmVehrebateCheckapplydetail entity = new ScmVehrebateCheckapplydetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } - public List fetchLastDetailsVoBySid(String sid) { - return baseMapper.fetchLastDetailsVoBySid(sid); - } + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } - public List selByMainSid(String mainSid) { - return baseMapper.selByMainSid(mainSid); - } + public List fetchWhenDetailsVoBySid(String sid) { + return baseMapper.fetchWhenDetailsVoBySid(sid); + } - public ResultBean> vehRebateCheckDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - List scmVehRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); - for (String s : sids) { - ScmVehRebateDetailsVo scmVehRebateDetailsVo = baseMapper.selByVehRebteSid(s); - if (scmVehRebateDetailsVo != null){ - scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost())); - scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString()); - scmVehRebateDetailsVos.add(scmVehRebateDetailsVo); - } - } - return rb.success().setData(scmVehRebateDetailsVos); - } + public List fetchLastDetailsVoBySid(String sid) { + return baseMapper.fetchLastDetailsVoBySid(sid); + } + + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } + + public ResultBean> vehRebateCheckDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateDetailsVos = baseMapper.selByVehRebteSid(sid); + for (ScmVehRebateDetailsVo scmVehRebateDetailsVo : scmVehRebateDetailsVos) { + scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost())); + scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString()); + } + return rb.success().setData(scmVehRebateDetailsVos); + } } \ No newline at end of file