From b7fc52562353044cdfa815f226b70801568e5a50 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 5 Sep 2024 15:01:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/controller/product/TbPlaceController.java | 6 +----- .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 2 +- .../service/impl/shopimpl/TbShopTableServiceImpl.java | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java index 806a634c..d6b4ef92 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java @@ -188,12 +188,8 @@ public class TbPlaceController { public ResponseEntity pay( @Validated @RequestBody PayDTO payDTO ) { - try { - return ResponseEntity.ok(tbShopTableService.pay(payDTO)); - }catch (Exception e) { - return ResponseEntity.badRequest().body(e.getMessage()); - } + return ResponseEntity.ok(tbShopTableService.pay(payDTO)); } @AnonymousAccess diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index dc5524b7..e72c3b46 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -438,7 +438,7 @@ public class TbPayServiceImpl implements TbPayService { return orderInfo; } - public TbOrderInfo memberAccountPay(String memberId, String shopId, String accountCode, Integer orderId, Double discount) throws Exception { + public TbOrderInfo memberAccountPay(String memberId, String shopId, String accountCode, Integer orderId, Double discount) { TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaUpdateWrapper() .eq(TbOrderInfo::getId, orderId) .eq(TbOrderInfo::getShopId, shopId)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 8fa1ee25..4d917b89 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1248,11 +1248,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo = tbPayServiceImpl.scanPay(payDTO); break; case "deposit": - try { - orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), payDTO.getOrderId(), payDTO.getDiscount()); - } catch (Exception e) { - throw new RuntimeException(e); - } + orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), payDTO.getOrderId(), payDTO.getDiscount()); break; default: throw new BadRequestException("未知支付方式");