From 236986d689cd6307533cf777bc964b89ea0f6f83 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Jul 2021 16:32:35 +0800 Subject: [PATCH] cs --- .../controller/callback/AliPayController.java | 19 +++++++++++++++---- .../callback/WxBusinessOrderController.java | 7 ++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index 69588e41d..9bb1a7375 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.pay.alipay.AliPayUtil; import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig; @@ -258,9 +259,14 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); + try{ + aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder); + return "success"; + }catch(MallinkException e){ + logger.error("处理订单 error"+e.getMessage()); + return "fail"; + } - aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder); - return "success"; } //退款成功 }else if ("alipay.business.mall.trade.refunded".equals(msgMethod)) { @@ -298,8 +304,13 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); - aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder); - return "success"; + try{ + aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder); + return "success"; + }catch(MallinkException e){ + logger.error("处理订单 error"+e.getMessage()); + return "fail"; + } } }else{ logger.error("alipay notify . 未知通知:"+paramMap); 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 fb4370008..e466fda39 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumThirdPartyConfigType; +import com.iformall.exception.MallinkException; import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper; import com.iformall.pay.WxPayConstant; import com.iformall.service.WxBusinessCircleOrderService; @@ -158,7 +159,11 @@ public class WxBusinessOrderController extends BaseController { logger.error("微信商圈通知---时间转换异常"); resultMap.put("code","FAIL"); return resultMap; - } catch (Exception e){ + } catch(MallinkException e){ + logger.error("微信商圈通知---"+e.getMessage()); + resultMap.put("code","FAIL"); + return resultMap; + }catch (Exception e){ e.printStackTrace(); logger.error("微信商圈通知---其他异常"); resultMap.put("code","FAIL");