From fa6debfb42e7d73c181600c57c00c82c2f92a07f Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Jul 2021 14:37:01 +0800 Subject: [PATCH] cs --- .../callback/WxBusinessOrderController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java index 4c5744c10..be22af5ec 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -54,6 +54,12 @@ public class WxBusinessOrderController extends BaseController { @ResponseBody public Map createOrder(@PathVariable String tenantId, HttpServletRequest request){ logger.info("[" +getIpAddr() + "]微信商圈通知-----"+tenantId); + Map resultMap = new HashMap<>(); + if(StringUtils.isBlank(tenantId)){ + logger.error("微信商圈通知-----tenantId为空"); + resultMap.put("code","FAIL"); + return resultMap; + } SignatureHeader header = new SignatureHeader(); header.setSerialNo(request.getHeader("Wechatpay-Serial")); @@ -61,15 +67,10 @@ public class WxBusinessOrderController extends BaseController { header.setNonce(request.getHeader("Wechatpay-Nonce")); header.setSigned(request.getHeader("Wechatpay-Signature")); + logger.info("微信商圈支付通知---header{}"+header.toString()); String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); logger.info("微信商圈支付通知---body{}"+body); - Map resultMap = new HashMap<>(); - if(StringUtils.isBlank(tenantId)){ - logger.error("微信商圈通知-----tenantId为空"); - resultMap.put("code","FAIL"); - return resultMap; - } TenantEntity tenantEntity = wxMallService.getByTenantId(tenantId); if(tenantEntity == null){ logger.error("微信商圈通知-----获取tenantEntity为null"); @@ -77,14 +78,13 @@ public class WxBusinessOrderController extends BaseController { return resultMap; } - WxPayService wxPayService = wxPayAccountService.getWxPayService(tenantId); - logger.info("微信商圈支付通知---获取wxPayService{}"+wxPayService); - if(wxPayService == null){ - logger.error("微信商圈通知-----获取wxPayService失败"); - resultMap.put("code","FAIL"); - return resultMap; - } try { + WxPayService wxPayService = wxPayAccountService.getWxPayService(tenantId); + if(wxPayService == null){ + logger.error("微信商圈通知-----获取wxPayService失败"); + resultMap.put("code","FAIL"); + return resultMap; + } //----------------签名验证----------- // BusinessCircleNotifyData notifyData = verifySignature(request,wxPayService); BusinessCircleNotifyData notifyData = wxPayService.getBusinessCircleService().parseNotifyData(body, header);