From 88e8efda266276767f2efc5c56776a6cf35b9bc7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 5 Mar 2025 18:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=8C=E4=BD=8D=E8=B4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index cbe1f6c5f..d29b1b345 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -242,6 +242,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (param.getPointsNum() > 0 && !pointSetting.getEnableDeduction().equals(1)) {
             throw new ValidateException("生成支付订单失败，该店铺未开启积分抵扣");
         }
+        orderInfo.setSeatNum(param.getSeatNum());
+        if (shopInfo.getIsTableFee() != 0 && shopInfo.getTableFee().compareTo(BigDecimal.ZERO) != 0) {
+            orderInfo.setSeatAmount(new BigDecimal(param.getSeatNum()).multiply(shopInfo.getTableFee()));
+        }else {
+            orderInfo.setSeatAmount(BigDecimal.ZERO);
+        }
         ShopUser shopUser = null;
         if (param.getUserId() != null) {
             UserInfo userInfo = userInfoService.getById(param.getUserId());
@@ -277,7 +283,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (prodCouponAmount.getPrice().compareTo(param.getProductCouponDiscountAmount()) != 0) {
             throw new ValidateException("生成支付订单失败，商品优惠券优惠金额不正确");
         }
-        orderInfo.setOriginAmount(totalAmount.getPrice());
+        orderInfo.setOriginAmount(totalAmount.getPrice().add(orderInfo.getSeatAmount()));
         BigDecimal newTotalAmount = totalAmount.getPrice();
         //折扣金额 如 9折 计算 为 订单金额*0.9 向上取整
         if (param.getDiscountRatio().compareTo(BigDecimal.ZERO) > 0) {