|
|
|
@@ -731,12 +731,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
List<WxMerchantVo> listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); |
|
|
|
wxMerchantVo = listCVo.get(0); |
|
|
|
result.put("merchant", wxMerchantVo.getMerchantName()); |
|
|
|
WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream().filter(s -> StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(null); |
|
|
|
WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream() |
|
|
|
.filter(s -> StringUtils.isNotEmpty(s.getLinkPhone()) || StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(null); |
|
|
|
if (wxShopVo != null) { |
|
|
|
String linkPerson = wxShopVo.getLinkPerson(); |
|
|
|
String linkPhone = wxShopVo.getLinkPhone(); |
|
|
|
result.put("linkPerson", StringUtils.isNotEmpty(linkPerson) ? linkPerson : " "); |
|
|
|
result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPerson : " "); |
|
|
|
result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPhone : " "); |
|
|
|
} else { |
|
|
|
result.put("linkPerson", " "); |
|
|
|
result.put("linkPhone", " "); |
|
|
|
|