|
|
|
@@ -187,8 +187,10 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill |
|
|
|
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq); |
|
|
|
for (int i = 0 ; i < page.getList().size() ; i ++) { |
|
|
|
WxAllBill e = page.getList().get(i); |
|
|
|
if (null != shopNumberMap) { |
|
|
|
e.setShopNumber(shopNumberMap.get(e.getMerchantId())); |
|
|
|
if (StringUtils.isBlank(e.getShopNumber())) { |
|
|
|
if (null != shopNumberMap) { |
|
|
|
e.setShopNumber(shopNumberMap.get(e.getMerchantId())); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != merchantMap) { |
|
|
|
WxMerchant m = merchantMap.get(e.getMerchantId()); |
|
|
|
|