|
|
|
@@ -727,12 +727,16 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
be.setEnergyFeesName(fees.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopUserMap) { |
|
|
|
WxShopUsers su = shopUserMap.get(be.getShopId()); |
|
|
|
if (null != su) { |
|
|
|
be.setCusName(su.getName()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isBlank(be.getCusName())) { |
|
|
|
if (null != shopUserMap) { |
|
|
|
WxShopUsers su = shopUserMap.get(be.getShopId()); |
|
|
|
if (null != su) { |
|
|
|
be.setCusName(su.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(list); |
|
|
|
@@ -793,11 +797,13 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
be.setEnergyFeesName(fees.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopUserMap) { |
|
|
|
WxShopUsers su = shopUserMap.get(be.getShopId()); |
|
|
|
if (null != su) { |
|
|
|
be.setCusName(su.getName()); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(be.getCusName())) { |
|
|
|
if (null != shopUserMap) { |
|
|
|
WxShopUsers su = shopUserMap.get(be.getShopId()); |
|
|
|
if (null != su) { |
|
|
|
be.setCusName(su.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|