diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java index 5accb1fafb..0efa74d61f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java @@ -78,6 +78,8 @@ public class ScmSpecialrebatedistributeVo implements Vo { private String uploadMoney; @ApiModelProperty("分配总金额") private String distributionMoneyTotal; + @ApiModelProperty("专项返利sid") + private String specialSid; @ApiModelProperty("分配数量") private String disNum; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index d7436ac340..ea2d84a600 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -181,6 +181,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmSpecialrebatedistributeVo record : pagging.getRecords()) { + String[] specialSids = record.getSpecialSid().split(","); + int disVehCount = 0; + for (String specialSid : specialSids) { + int i = scmSpecialrebateVehsService.getDisVehCount(specialSid); + disVehCount = disVehCount + i; + } + record.setDisNum(String.valueOf(disVehCount)); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; }