From 271f6665d74dfd0d31122be632cb3dbfe4a9ae5c Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 20 Aug 2019 17:50:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillAllController.java | 1 - .../com/iformall/domain/vo/WxBillAll.java | 3 ++ .../service/impl/WxBillAllServiceImpl.java | 44 +++++++++++-------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index fe528810b..695b757ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -97,7 +97,6 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } - /** * 应收、承付商户列表 * @param wxBillAll 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 78983cc56..a1729c9c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -137,4 +137,7 @@ public class WxBillAll extends BaseEntity { @SortColumn(column = "payOut") private Integer payOut; + @Transient + private Integer balance; + } 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 7317d6e2a..f54e7e141 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1532,17 +1532,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); Map result = new HashMap<>(); - pageInfo.getList().stream().forEach(e ->{ - if(e.get("receivePay")==null){ - e.put("receivePay",0); - } - if(e.get("payOut")==null){ - e.put("payOut",0); - } - BigDecimal r = new BigDecimal(e.get("receivePay")==null?"0":e.get("receivePay").toString()); - BigDecimal p = new BigDecimal(e.get("payOut")==null?"0":e.get("payOut").toString()); - e.put("balance",r.subtract(p)); - }); + initBalance(pageInfo.getList()); result.put("pageInfo", pageInfo); return result; } @@ -1582,22 +1572,40 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); } + public void initBalance(List> data){ + data.stream().forEach(e ->{ + if(e.get("receivePay")==null){ + e.put("receivePay",0); + } + if(e.get("payOut")==null){ + e.put("payOut",0); + } + BigDecimal r = new BigDecimal(e.get("receivePay")==null?"0":e.get("receivePay").toString()); + BigDecimal p = new BigDecimal(e.get("payOut")==null?"0":e.get("payOut").toString()); + e.put("balance",r.subtract(p)); + }); + } + @Override public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { List> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + initBalance(data); + List list = new ArrayList<>(); for (Map map : data) { ReceivedAndPayVo oweMerchantVo = new ReceivedAndPayVo(); oweMerchantVo.setLinkPerson((String) map.get("linkPerson")); - oweMerchantVo.setName((String) map.get("merchantName")); + oweMerchantVo.setName((String) map.get("name")); oweMerchantVo.setLinkPhone((String) map.get("linkPhone")); oweMerchantVo.setShopNumber((String) map.get("shopNumber")); -// -// oweMerchantVo.setShopNumber(new BigDecimal(subZeroAndDot(map.get("rentReceivePay").toString()))); -// oweMerchantVo.setPropertyReceivePay(new BigDecimal(subZeroAndDot(map.get("propertyReceivePay").toString()))); -// oweMerchantVo.setDepositReceivePay(new BigDecimal(subZeroAndDot(map.get("depositReceivePay").toString()))); -// oweMerchantVo.setOtherReceivePay(new BigDecimal(subZeroAndDot(map.get("otherReceivePay").toString()))); -// oweMerchantVo.setTotalReceivePay(new BigDecimal(subZeroAndDot(map.get("totalReceivePay").toString()))); + if(EnumRentShopType.POINT.getCode().equals(map.get("type"))){ + oweMerchantVo.setShopType("多经点位"); + }else if(EnumRentShopType.SHOP.getCode().equals(map.get("type"))){ + oweMerchantVo.setShopType("商铺"); + } + oweMerchantVo.setReceivePay(map.get("receivePay")==null?"0":map.get("receivePay").toString()); + oweMerchantVo.setPayOut(map.get("payOut")==null?"0":map.get("payOut").toString()); + oweMerchantVo.setBalance(map.get("balance")==null?"0":map.get("balance").toString()); list.add(oweMerchantVo); } String name = "商户列表";