From 03a4f16fd188f9bc77e3b41fcf0c2aa591b54d6f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 10:40:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E5=82=AC=E7=BC=B4?= =?UTF-8?q?=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 b484db1e1..69db4816a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -612,8 +612,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); if (payAccountBill != null) { - result.put("accountNumber", payAccountBill.getBankCardId()); - result.put("accountName", payAccountBill.getBankAccountName()); + String bankCardId = payAccountBill.getBankCardId(); + String bankAccountName = payAccountBill.getBankAccountName(); + result.put("accountNumber", StringUtils.isNotEmpty(bankCardId) ? bankCardId : " "); + result.put("accountName", StringUtils.isNotEmpty(bankAccountName) ? bankCardId : " "); } else { result.put("accountNumber", " "); result.put("accountName", " "); @@ -710,8 +712,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { result.put("merchant", wxMerchantVo.getMerchantName()); WxShopVo wxShopVo = wxMerchantVo.getShopVoList().parallelStream().filter(s -> StringUtils.isNotEmpty(s.getLinkPhone())).findAny().orElse(null); if (wxShopVo != null) { - result.put("linkPerson", wxShopVo.getLinkPerson()); - result.put("linkPhone", wxShopVo.getLinkPhone()); + String linkPerson = wxShopVo.getLinkPerson(); + String linkPhone = wxShopVo.getLinkPhone(); + result.put("linkPerson", StringUtils.isNotEmpty(linkPerson) ? linkPerson : " "); + result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPerson : " "); } else { result.put("linkPerson", " "); result.put("linkPhone", " "); @@ -975,4 +979,5 @@ public class WxBillAllServiceImpl implements WxBillAllService { String name = "待缴商户列表"; excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); } + }