From 06582095586051936549a6c6b1a20c4dd73ff555 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 30 Nov 2018 17:51:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A2=E6=B5=81=E6=95=B0=E6=8D=AE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=95=B0=E6=8D=AE=E6=89=8D=E8=BF=94=E5=9B=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 14 ++++++-------- .../service/impl/PushLimitServiceImpl.java | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 97d4dbec9..dd8c9f1c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -616,18 +616,16 @@ public class DataTowerServiceImpl implements DataTowerService { @Override public Map queryCustomer(String tenantId) { - - WxWiWideInfo wiWideInfo = new WxWiWideInfo(); wiWideInfo.setTenantId(tenantId); List list = wxWiwideInfoMapper.findList(wiWideInfo); - wiWideInfo = list.get(0); - String wiwideUrl = wiWideInfo.getWiwideUrl(); Map datamap = new HashMap<>(2); - - datamap.put("token", getWiwideToken(wiWideInfo)); - datamap.put("url", wiwideUrl); - + if(list.size()>0){ + wiWideInfo = list.get(0); + String wiwideUrl = wiWideInfo.getWiwideUrl(); + datamap.put("token", getWiwideToken(wiWideInfo)); + datamap.put("url", wiwideUrl); + } return datamap; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index 30c1c8121..0e9cc3b6d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -95,7 +95,7 @@ public class PushLimitServiceImpl implements PushLimitService { // 2. check time boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd()); if (!isInDate) { - logger.error("短信已达到每天上限"); + logger.error("不在疲劳度允许的时间段"); throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG); } return isInDate; @@ -109,7 +109,7 @@ public class PushLimitServiceImpl implements PushLimitService { // 2. check time boolean isInDate = DateUtils.isInDate(curDate, pushLimit.getTimeStart(), pushLimit.getTimeEnd()); if (!isInDate) { - logger.error("短信已达到每天上限"); + logger.error("不在疲劳度允许的时间段"); throw new MallinkException(ErrorCode.PUSH_LIMIT_NOT_INRANG); } // TODO 3. check phone had up to limit