From 738ff78b10fb2e2052dc18119b713f4d992c7d2f Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 19 Aug 2019 19:02:26 +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 | 18 +++++++++++++ .../iformall/domain/vo/ReceivedAndPayVo.java | 27 +++++++++++++++++++ .../iformall/service/WxBillAllService.java | 1 + .../service/impl/WxBillAllServiceImpl.java | 27 ++++++++++++++++++- 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java 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 af5136cc7..fe528810b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -121,6 +121,24 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } + /** + * 导出应收、承付商户列表 + * @param wxBillAll + * @return + */ + @GetMapping("exportReceiveAndPayMerchantlist") + @SystemControllerLog(description = "账单管理-导出应收、承付商户列表") + @ApiOperation("导出应收、承付商户列表") + public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + wxBillAll.setTenantId(getTenantId()); + wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); + } + + @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java new file mode 100644 index 000000000..f4b3f2263 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/ReceivedAndPayVo.java @@ -0,0 +1,27 @@ +package com.iformall.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + + + +@Data +public class ReceivedAndPayVo { + + @Excel(name="商户名",width = 20,orderNum = "1") + private String name; + @Excel(name="商铺号",width = 20,orderNum = "2") + private String shopNumber; + @Excel(name="商铺类型",width = 20,orderNum = "3") + private String shopType; + @Excel(name="负责人",width = 20,orderNum = "4") + private String linkPerson; + @Excel(name="负责人电话",width = 20,orderNum = "5") + private String linkPhone; + @Excel(name="应收总额(元)",width = 20,orderNum = "6") + private String receivePay; + @Excel(name="承付总额(元)",width = 20,orderNum = "7") + private String payOut; + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 10e9a34cb..847f04673 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -56,6 +56,7 @@ public interface WxBillAllService { */ Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); 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 2382a264d..659e1428e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1535,9 +1535,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { pageInfo.getList().stream().forEach(e ->{ if(e.get("receivePay")==null){ e.put("receivePay",0); - }else if(e.get("payOut")==null){ + } + 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)); }); result.put("pageInfo", pageInfo); return result; @@ -1578,6 +1582,27 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); } + @Override + public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { + List> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + List list = new ArrayList<>(); + for (Map map : data) { + WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); + oweMerchantVo.setLinkPerson((String) map.get("manager")); + oweMerchantVo.setName((String) map.get("merchantName")); + oweMerchantVo.setLinkPhone((String) map.get("managerPhone")); + + oweMerchantVo.setRentReceivePay(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()))); + list.add(oweMerchantVo); + } + String name = "商户列表"; + excelService.exportExcel(list, null, name, ReceivedAndPayVo.class, name + ".xlsx", response, false); + } + @Override public void exportWaitMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { List> data = wxBillAllMapper.getOweBillAsPage(record);