Browse Source

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 years ago
parent
commit
575cc6bbf2
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -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", " ");


Loading…
Cancel
Save