diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index 302a08e28..f4a51d95e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -60,7 +60,7 @@ public class BillNotificationSchedule { private void sendOweBill() { logger.info("查询欠缴账单数据"); - List> oweBillList = wxBillAllMapper.getOWeBill(); + List> oweBillList = wxBillAllMapper.getOweBill(); for (Map bill : oweBillList) { logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); String tenantId = bill.get("tenantId").toString(); @@ -76,7 +76,7 @@ public class BillNotificationSchedule { if (wxMsgValidationcodeModel != null) { String signature = wxMsgValidationcodeModel.getSignature(); String msg = wxMsgValidationcodeModel.getContent(). - replace("{price}", String.valueOf(price.doubleValue())). + replace("{price}", price.toString()). replace("{app}", appname); String notifyUrl = wxMsgConfig.getNotifyurl(); String secret = wxMsgConfig.getSecret(); @@ -107,7 +107,7 @@ public class BillNotificationSchedule { if (wxMsgValidationcodeModel != null) { String signature = wxMsgValidationcodeModel.getSignature(); String msg = wxMsgValidationcodeModel.getContent(). - replace("{price}", String.valueOf(price.doubleValue())). + replace("{price}", price.toString()). replace("{date}", receiveDate). replace("{app}", appname); String notifyUrl = wxMsgConfig.getNotifyurl(); @@ -138,10 +138,15 @@ public class BillNotificationSchedule { } private WxMsgValidationcodeModel getMsgModel(String tenantId, Integer type) { + logger.info("获取通知模板-租户:" + tenantId + ",类型:" + type); WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); wxMsgValidationcodeModel.setTenantId(tenantId); wxMsgValidationcodeModel.setType(type); - return wxMsgValidationcodelModelMapper.findList(wxMsgValidationcodeModel).get(0); + List list = wxMsgValidationcodelModelMapper.findList(wxMsgValidationcodeModel); + if (!list.isEmpty()) { + return wxMsgValidationcodelModelMapper.findList(wxMsgValidationcodeModel).get(0); + } + return null; } private void sendWaitPayBillMsg(String phone, String signature, String msg, String notifyUrl, String secret, String bid, String publickey) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 0cab07114..a3c0f5384 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -1,7 +1,5 @@ package com.iformall.mapper; -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.MallPermission; import com.iformall.domain.vo.WxBillAll; import java.util.List; @@ -10,7 +8,7 @@ import java.util.Map; /** * @author gongbiao */ -public interface WxBillAllMapper extends CommonMapper { +public interface WxBillAllMapper { List> list(WxBillAll record); @@ -23,6 +21,6 @@ public interface WxBillAllMapper extends CommonMapper { List> getWaitPayBill(); - List> getOWeBill(); + List> getOweBill(); }