Explorar el Código

[账单][修改][导入数据]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
5a7c57bcc4
Se han modificado 1 ficheros con 12 adiciones y 8 borrados
  1. +12
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java

+ 12
- 8
mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java Ver fichero

@@ -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();


Cargando…
Cancelar
Guardar