diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java index 03ef7ba44b..d338be9b35 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java @@ -57,11 +57,16 @@ import java.util.List; fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class) public interface ScmSpecialrebateCheckapplydetailFeign { - @ApiOperation("专项返利核对查看详情") + @ApiOperation("专项返利核对查看全部详情") @GetMapping("/specialRebateCheckDetails/{sid}") @ResponseBody public ResultBean> specialRebateCheckDetails(@PathVariable("sid") String sid); + @ApiOperation("专项返利核对查看分组详情") + @GetMapping("/specialRebateGroupDetails/{sid}") + @ResponseBody + public ResultBean> specialRebateGroupDetails(@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/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java index d39d4e4c84..101e2755f6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java @@ -41,6 +41,11 @@ public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecial return null; } + @Override + public ResultBean> specialRebateGroupDetails(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/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java index 4b9bba733c..33c63f59d1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java @@ -60,6 +60,11 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid); } + @Override + public ResultBean> specialRebateGroupDetails(String sid) { + return scmSpecialrebateCheckapplydetailService.specialRebateGroupDetails(sid); + } + @Override public ResultBean> appMx(String sid) { return scmSpecialrebateCheckapplydetailService.appMx(sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java index 6b1846ea21..8296feaea4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java @@ -118,4 +118,17 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< } return rb.success().setData(scmSpecialRebateDetailsVos); } + + public ResultBean> specialRebateGroupDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmSpecialRebateDetailsVos = new ArrayList<>(); + String[] sids = sid.split(","); + for (String s : sids) { + ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(s); + scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); + scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); + scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo); + } + return rb.success().setData(scmSpecialRebateDetailsVos); + } } \ No newline at end of file