diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index 11f79c397..3e8f1d985 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -104,7 +104,10 @@ public class ImportTemplateTask { //3 计失败条数 List billSuccessList = new ArrayList<>(); successList.parallelStream().forEach(s -> { - if (StringUtils.isNotEmpty(s.getMerchantName())) { + if (StringUtils.isNotEmpty(s.getMerchantName()) && null != s.getBillType() + && StringUtils.isNotEmpty(s.getBillAttr()) && null != s.getStarttime() + && null != s.getEndtime() && StringUtils.isNotEmpty(s.getPayStr()) + && null != s.getPayDate() && null != s.getReceiveDate()) { WxMerchant wxMerchant = merchantMap.get(s.getMerchantName()); if (wxMerchant != null) { Long merchantId = wxMerchant.getId();