From 9fdce98360daacb348dee54586c5218e1d55d862 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 6 Mar 2019 10:50:43 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E5=A4=8D]:=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=8D=96=E5=A4=96=E8=BF=AA=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=88=A4=E6=96=AD=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E9=98=B2=E6=AD=A2=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../com/iformall/service/impl/DataTowerServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 589a208bc..2b0e026df 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -338,7 +338,7 @@ public enum ErrorCode{ SHOP_IS_RENT(22001,"商铺已出租"), WIWIDE_INFO_NOT_FOUND(23001,"迈外迪信息未找到"), - + WIWIDE_INFO_NOT_READY(23002,"迈外迪信息未就绪"), /** * 微信第三方 */ 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 ade5c1824..4d60a1fb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -721,8 +721,10 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("wiwideinfo:"+JSONObject.toJSONString(wiWideInfo)); if (StringUtils.isEmpty(token) || expiredTime == null || expiredTime.before(new Date())) { String data = WiwideUtil.queryToken(wiWideInfo); - token = (String) JSONObject.parseObject(data).get("data"); logger.info("bid:"+wiWideInfo.getWiwideId()+",newdata:"+data); + if (data == null) + return null; + token = (String) JSONObject.parseObject(data).get("data"); updateToken(wiWideInfo, token); } logger.info("返回的token:"+token); @@ -752,6 +754,8 @@ public class DataTowerServiceImpl implements DataTowerService { } String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params); JSONObject result = JSONObject.parseObject(res); + if (result == null) + return new ResultData(ErrorCode.WIWIDE_INFO_NOT_READY); if (result.getInteger("result") == 200){ return new ResultData(result.getInteger("result"),result.getString("msg"), result.getJSONObject("data"));