From c7751c7e1d25ca2e9aaf643ef6718714a09bc502 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 29 May 2021 16:48:04 +0800 Subject: [PATCH] tt --- .../iformall/service/WxMerchantService.java | 1 + .../service/impl/WxMerchantServiceImpl.java | 5 +++++ .../controller/WxMerchantController.java | 21 +++++-------------- .../schedule/TtOrderExpiringSchedule.java | 2 +- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 93e22be13..742f2546f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -107,6 +107,7 @@ public interface WxMerchantService { * @param id * @return */ + WxMerchant selectById(Long id); WxMerchant getById(Long id); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 980bd2e20..0bee01edf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -155,6 +155,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { return collect; } + @Override + public WxMerchant selectById(Long id) { + return wxMerchantMapper.selectById(id); + } + @Override public WxMerchant getById(Long id) { WxMerchant wxMerchant = wxMerchantMapper.selectById(id); diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 700589d98..9c5c878ba 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -64,25 +64,14 @@ public class WxMerchantController extends BaseController { } @ApiOperation("根据code查询接口") - @GetMapping("/findByCode") + @GetMapping("/findById") @ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true) - public ResultData findByCode(String merchantCode) { - logger.debug("[" + getIpAddr() + "] WxMerchantController::findByCode"); - if(merchantCode == null) { + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); + if(id == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - String codeMD5 = HashUtil.DecodeByMD5(merchantCode); - if(StringUtils.isBlank(codeMD5)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - HashMap params = new HashMap(); - TenantEntity tenantEntity = getTenantInfo(); - params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", tenantEntity.getParentTenantId()); - } - params.put("merchantCode", codeMD5); - WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params); + WxMerchant wxMerchant = wxMerchantService.selectById(id); return new ResultData(wxMerchant); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java index fd78b0a44..10af093b0 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java +++ b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java @@ -42,7 +42,7 @@ public class TtOrderExpiringSchedule { return tenantEntity; } - @Scheduled(cron = "0 */1 * * * *?") // 每1分钟检查一次 + @Scheduled(cron = "0 */10 * * * *?") // 每10分钟检查一次 public void orderExpireSchedule() { WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(getTenantInfo(), EnumPayWay.PAY_WAY_TT);