diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java index 0f09ac63d4..ba73448b08 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java @@ -72,11 +72,16 @@ public interface ScmVehrebateCheckapplydetailFeign { @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - @ApiOperation("单车返利核对查看详情") + @ApiOperation("单车返利核对查看所有详情") @GetMapping("/vehRebateCheckDetails/{sid}") @ResponseBody public ResultBean> vehRebateCheckDetails(@PathVariable("sid") String sid); + @ApiOperation("单车返利核对查看分组详情") + @GetMapping("/vehRebateGroupDetails/{sid}") + @ResponseBody + public ResultBean> vehRebateGroupDetails(@PathVariable("sid") String sid); + @ApiOperation("app查询明细") @GetMapping("/appMx/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java index d3a8f9fec1..a7b671a9f8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java @@ -70,6 +70,11 @@ public class ScmVehrebateCheckapplydetailFeignFallback implements ScmVehrebateCh return null; } + @Override + public ResultBean> vehRebateGroupDetails(String sid) { + return null; + } + @Override public ResultBean> appMx(String sid) { return null; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java index ea8f910f47..7d22c8b8fd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java @@ -80,6 +80,11 @@ public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplyd return scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid); } + @Override + public ResultBean> vehRebateGroupDetails(String sid) { + return scmVehrebateCheckapplydetailService.vehRebateGroupDetails(sid); + } + @Override public ResultBean> appMx(String sid) { return scmVehrebateCheckapplydetailService.appMx(sid); 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 12cb4bc269..3ec2ffae3c 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 @@ -90,7 +90,7 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService> vehRebateCheckDetails(String sid) { ResultBean rb = ResultBean.fireFail(); - List scmVehRebateDetailsVos = baseMapper.selByVehRebteSid(sid); + 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()); @@ -122,4 +122,17 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService> vehRebateGroupDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateDetailsVos = new ArrayList<>(); + String[] vehRebateSids = sid.split(","); + for (String vehRebateSid : vehRebateSids) { + ScmVehRebateDetailsVo scmVehRebateDetailsVo = baseMapper.selByVehRebteSidNew(vehRebateSid); + 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); + } } \ No newline at end of file