From 46b1a4da4a892d01fc84abbb188f2091790b99b5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 27 May 2019 11:22:24 +0800 Subject: [PATCH] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][1001641]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index e3e0cdc0f..b42b62485 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -891,8 +891,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("欠缴账单通知"); mailMsg.setHtml(true); - mailMsg.setModelType(EnumMsgRecordType.EMAIL.getCode()); + mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_OWE.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); mailMsg.setDynamicContentMap(map); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9552d974a..9d21134bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -891,7 +891,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //获取price 、shopInfo long price = priceArrs[index]; Map shopInfo = null; - if(shopInfoList != null){ + if(!CollectionUtils.isEmpty(shopInfoList)){ shopInfo = shopInfoList.get(index); }