From 916774a0bd55b7c9b826a59d32876e20ed633ed1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 15 May 2019 19:32:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9[=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) 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 a879da667..6b1a0aebf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -222,18 +223,28 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll) { - Map> billMapList = wxBillAllMapper.list(wxBillAll) - .parallelStream() + Map> collect = wxBillAllMapper.list(wxBillAll).parallelStream() .collect(Collectors.groupingBy(WxBillAllVo::getMerchantId)); - - List list = new ArrayList<>(); - - Set>> entries = billMapList.entrySet(); + Set>> entries = collect.entrySet(); + List datalist = new ArrayList<>(); for (Map.Entry> entry : entries) { - list.addAll(entry.getValue()); + List list = entry.getValue(); + for (WxBillAllVo wxBillAllVo : list) { + String shopNumber = wxBillAllVo.getShopNumber(); + if (StringUtils.isEmpty(shopNumber)) { + String shopInfo = wxBillAllVo.getShopInfo(); + if (StringUtils.isNotEmpty(shopInfo) && !shopInfo.equals("[]")) { + JSONObject jsonObject = JSONObject.parseObject(shopInfo); + StringBuffer sb = new StringBuffer(); + Set> sets = jsonObject.entrySet(); + sets.forEach(x -> sb.append(x.getKey()).append(",")); + wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } + } + datalist.add(wxBillAllVo); + } } - - excelService.exportExcel(list, null, "账单数据", WxBillAllVo.class, "账单数据.xlsx", response); + excelService.exportExcel(datalist, null, "账单数据", WxBillAllVo.class, "账单数据.xlsx", response); } private int updateBillOtherDeposit(Map bill) {