|
|
|
@@ -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); |
|
|
|
} |
|
|
|
|
|
|
|
} |