From 42e02d5ad8e405951c1b4e00321daf265d5d8c44 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 26 Nov 2018 13:21:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=B5=81TOKEN?= =?UTF-8?q?=E6=97=B6=E9=97=B430=E5=88=86=E9=92=9F=E4=B8=80=E6=AC=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/WiwideTokenSchedule.java | 8 ++++++-- .../main/java/com/iformall/utils/WiwideUtil.java | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java index 6b8905c41..e26f543bb 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java @@ -25,13 +25,17 @@ public class WiwideTokenSchedule { @Autowired private WxWiwideInfoMapper wxWiwideInfoMapper; - @Scheduled(cron = "0 0/45 * * * ?") + @Scheduled(cron = "0 0/30 * * * ?") public void requestToken() { List list = wxWiwideInfoMapper.findList(null); for (int i = 0, size = list.size(); i < size; i++) { WxWiWideInfo wxWiWideInfo = list.get(i); String data = WiwideUtil.queryToken(wxWiWideInfo); String token = (String) JSONObject.parseObject(data).get("data"); + if(token==null){ + logger.error("商场:"+wxWiWideInfo.getTenantId()+",token为空"); + continue; + } updateToken(wxWiWideInfo, token); } @@ -47,7 +51,7 @@ public class WiwideTokenSchedule { try { wxWiwideInfoMapper.updateToken(record); } catch (MallinkException e) { - logger.info("更新TOKEN失败：商场" + wxWiWideInfo.getTenantId()); + logger.error("更新TOKEN失败：商场" + wxWiWideInfo.getTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java b/mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java index db620e2e0..9993a27f8 100644 --- a/mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java @@ -2,9 +2,9 @@ package com.iformall.utils; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; -import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxWiWideInfo; import com.iformall.exception.MallinkException; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.codec.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -135,7 +135,17 @@ public class WiwideUtil { logger.info("获取TOKEN"); String username = wiWideInfo.getWiwideId(); String authVal = WiwideUtil.encrypt(wiWideInfo.getWiwideKey()); - Map params = new HashMap<>(); + if(StringUtils.isEmpty(username)){ + logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideId为空" ); + return null; + } + + if(StringUtils.isEmpty(authVal)){ + logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideKey为空" ); + return null; + } + + Map params = new HashMap<>(2); params.put("username", username); params.put("authVal", authVal); String wiwideUrl = wiWideInfo.getWiwideUrl(); From 4418c9c2f39f7c7d3fa68b176f1faf214f786173 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 26 Nov 2018 15:15:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantTradeDailyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index a04ba44ac..76dfa7be9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -41,7 +41,7 @@ public class WxMerchantTradeDailyController extends BaseController { cal.add(Calendar.DAY_OF_YEAR, -1); SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime())); - wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.CreateDate_DESC); + wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); final PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); return new ResultData(page); } From e564d83dca027c1972beff402ec4ca65bd1f6e99 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 26 Nov 2018 16:29:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=BE=85=E7=AD=BE=E7=BA=A6=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxRentContractMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 11482ec64..80c7728a9 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -134,8 +134,8 @@ update wx_rent_contract set status=#{status} where shop_id in ( - select s.shop_id from (SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and merchant_id is not null and status!=6 - )s) and merchant_id is null and tenant_id=#{tenantId} + select s.shop_id from (SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status in(2,3,4) + )s) and status=1 and status!=7 and tenant_id=#{tenantId}