From 67094106715d1f14250fa1ed861c9e85c7c44178 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 4 Jul 2019 14:55:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=85=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=B8=8D=E6=BB=A1=E8=B6=B3=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=AE=A9=E8=A7=86=E4=B8=BA=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/mem/ImportTemplateTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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();