From 557f263643ff19e0992a574aad89318e0a86889a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 27 Nov 2024 15:12:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8C=82=E5=8D=95?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/cons/TableConstant.java | 11 +++++++++++ .../java/cn/ysk/cashier/dto/shoptable/PayDTO.java | 1 + .../service/impl/shopimpl/TbShopTableServiceImpl.java | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/TableConstant.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/TableConstant.java index 956f3942..3225bba7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/TableConstant.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/TableConstant.java @@ -97,6 +97,17 @@ public interface TableConstant { } + @Getter + public enum PayType { + CREDIT_BUYER("creditBuyer"); + private final String value; + + PayType(String value) { + this.value = value; + } + } + + @Getter public enum UseType { TAKEOUT("takeout"), diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java index 77b1a8b5..44f82220 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java @@ -31,5 +31,6 @@ public class PayDTO { private Integer pointsNum; private Integer staffId; private String loginName; + private String creditBuyerId; } 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 cd72bdbc..8d95cb21 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 @@ -134,6 +134,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { private final TbShopUserMapper tbShopUserMapper; private final ThirdPartyCouponService thirdPartyCouponService; private final TbThirdPartyCouponRecordService thirdPartyCouponRecordService; + private final TbCreditBuyerOrderService creditBuyerOrderService; private TbOrderInfo getCurrentOrder(ShopEatTypeInfoDTO eatTypeInfoDTO) { // 获取当前台桌最新订单,先付款模式不获取 @@ -2281,6 +2282,12 @@ public class TbShopTableServiceImpl implements TbShopTableService { boolean isOnline = false; switch (payDTO.getPayType()) { + case "creditBuyer": + if (payDTO.getCreditBuyerId() == null) { + throw new BadRequestException("挂单人不为空"); + } + creditBuyerOrderService.save(payDTO.getCreditBuyerId(), Long.valueOf(orderInfo.getId())); + orderInfo.setPayType(TableConstant.OrderInfo.PayType.CREDIT_BUYER.getValue()); case "vipPay": if (payDTO.getVipUserId() != null) { orderInfo.setUserId(String.valueOf(payDTO.getVipUserId()));