|
|
|
@@ -103,14 +103,18 @@ public class ImportTemplateTask { |
|
|
|
}); |
|
|
|
//3 计失败条数 |
|
|
|
List<WxBillExcelTemplateOther> billSuccessList = new ArrayList<>(); |
|
|
|
successList.parallelStream().filter(s -> StringUtils.isNotEmpty(s.getMerchantName())).forEach(s -> { |
|
|
|
WxMerchant wxMerchant = merchantMap.get(s.getMerchantName()); |
|
|
|
Long merchantId = wxMerchant.getId(); |
|
|
|
if (merchantId != null) { |
|
|
|
s.setMerchantId(merchantId); |
|
|
|
Integer type = wxMerchant.getType(); |
|
|
|
s.setMerchantType(type); |
|
|
|
billSuccessList.add(s); |
|
|
|
successList.parallelStream().forEach(s -> { |
|
|
|
if (StringUtils.isNotEmpty(s.getMerchantName())) { |
|
|
|
WxMerchant wxMerchant = merchantMap.get(s.getMerchantName()); |
|
|
|
if (wxMerchant != null) { |
|
|
|
Long merchantId = wxMerchant.getId(); |
|
|
|
if (merchantId != null) { |
|
|
|
s.setMerchantId(merchantId); |
|
|
|
Integer type = wxMerchant.getType(); |
|
|
|
s.setMerchantType(type); |
|
|
|
billSuccessList.add(s); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
int billSuccessSize = billSuccessList.size(); |
|
|
|
|