diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 4d310d355..8fb4b02e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -152,4 +152,13 @@ public class WxBillAll extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "多个类型", name = "typeStr") private String typeStr; + + @TableField(exist = false) + private Integer servicePayRate; + + @TableField(exist = false) + private Integer limitStart; + @TableField(exist = false) + private Integer limitEnd; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 29f5ea41a..5ce01abc3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1719,19 +1719,36 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { - PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); - pageInfo.getList().stream().forEach(e->{ - if(e.get("receivePay") == null){ - e.put("receivePay",0); - } - if(e.get("payOut") == null){ - e.put("payOut",0); - } - if(e.get("balance") == null){ - e.put("balance",0); - } - }); Map result = new HashMap<>(); + record.setLimitStart(0); + record.setLimitEnd(Integer.MAX_VALUE); + List totalList = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + if(CollectionUtils.isEmpty(totalList)){ + PageHelper.startPage(pageNum, pageSize); + PageInfo> pageInfo = new PageInfo(new ArrayList()); + pageInfo.setPages(0); + pageInfo.setTotal(0); + PageHelper.clearPage(); + result.put("pageInfo", pageInfo); + return result; + } + + int total = totalList.size(); + int pages; + if(total % pageSize == 0){ + pages = total / pageSize; + }else{ + pages = total / pageSize +1; + } + record.setLimitStart((pageNum -1) * pageSize); + record.setLimitEnd(pageSize); + List> list = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + + PageHelper.startPage(pageNum, pageSize); + PageInfo> pageInfo = new PageInfo(list); + pageInfo.setPages(pages); + pageInfo.setTotal(total); + PageHelper.clearPage(); result.put("pageInfo", pageInfo); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 81e011b0a..68a726a27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -141,8 +141,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData saveOrUpdate(WxBillDaily record, MallUserInfo user) { - int receivepay = record.getReceivePay().intValue(); - int pay = record.getPay().intValue(); + int receivepay = record.getReceivePay()==null?0:record.getReceivePay().intValue(); + int pay = record.getPay()==null?0:record.getPay().intValue(); if(pay>receivepay){ return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(),"实收金额不能大于实际应收金额"); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8b25ffe46..d4fa4cffa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -739,26 +739,28 @@