From 63a5e4ee664b3b906026c4e2e54ec329fdbc9063 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 8 May 2025 09:20:41 +0800 Subject: [PATCH] =?UTF-8?q?H5=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/order/business/OrderBusiness.java | 3 +++ .../core/order/controller/OrderInfoController.java | 13 ++++++++++++- .../order/service/impl/OrderInfoServiceImpl.java | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java index 77abb09..2ef8a26 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java @@ -128,6 +128,9 @@ public class OrderBusiness { for(OrderInfo orderInfo : orderInfoList) { deductFromWallets(orderInfo, subsidyWalletBal); } + } catch (ServiceException ex) { + log.error("订单支付异常", ex); + throw new ServiceException(ex.getMessage()); } catch (Exception ex) { log.error("订单支付异常", ex); throw new ServiceException("支付失败"); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java index ad6d5a8..071fea3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java @@ -132,7 +132,18 @@ public class OrderInfoController extends BaseController @ResponseBody public AjaxResult addSave(@RequestBody @Valid OrderAddParam orderAddParam) { - return toAjax(orderInfoService.insertCanteenOrderInfo(orderAddParam)); + try { + orderInfoService.insertCanteenOrderInfo(orderAddParam); + }catch (ServiceException ex) { + if(Integer.valueOf(500001).equals(ex.getCode())) { + return AjaxResult.success(ex.getMessage()); + }else { + return AjaxResult.error(ex.getMessage()); + } + }catch (Exception ex) { + return AjaxResult.error("下单失败"); + } + return AjaxResult.success(); } @SysLog(title = "下单", module = "订单", businessType = OperaType.INSERT) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index a522791..0dad1c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -150,7 +150,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderBusiness.orderPay(orderInfoList); }catch (Exception ex) { orderBusiness.updateOrderPayFailed(orderInfoList); - throw new ServiceException(ex.getMessage()); + throw new ServiceException(ex.getMessage(), 500001); }finally { AccRedisUtils.unlockUpdateAccWalletBalance(orderAddParam.getUserId()); }