From ed35c0a6be73cb1d17c0061699d183caa28d1659 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sun, 28 Sep 2025 17:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E5=87=8F=E5=90=8E=20=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoServiceImpl.java | 9 ++++++++-
 1 file changed, 8 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 df6f8f40d..9198a00be 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
@@ -491,6 +491,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         newTotalAmount = newTotalAmount.subtract(param.getRoundAmount());
         //校验最终金额（订单金额 (扣除各类折扣)+打包费 餐位费）
         newTotalAmount = newTotalAmount.add(packAmount.getPrice()).add(orderInfo.getSeatAmount());
+        if (newTotalAmount.compareTo(BigDecimal.ZERO) <= 0) {
+            newTotalAmount = BigDecimal.ZERO;
+        }
         if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) {
             log.info("支付计算金额不正确，订单Id:{},最终计算金额为：{},打包费：{}，餐位费：{},积分抵扣金额：{},抹零金额：{}",
                     orderInfo.getId(), newTotalAmount, packAmount.getPrice(), orderInfo.getSeatAmount(),
@@ -1150,7 +1153,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         //0元按照现金支付处理
         if (orderInfo.getOrderAmount().compareTo(BigDecimal.ZERO) == 0) {
             orderInfo.setStatus(OrderStatusEnums.DONE.getCode());
-            orderInfo.setPayType(PayEnums.CASH_PAY.getValue());
+            if (param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
+                orderInfo.setPayType(PayEnums.VIP_PAY.getValue());
+            }else {
+                orderInfo.setPayType(PayEnums.CASH_PAY.getValue());
+            }
             orderInfo.setPaidTime(LocalDateTime.now());
             if (orderInfo.getUserId() != null) {
                 ShopUser shopUser = shopUserService.getShopUserInfo(orderInfo.getShopId(), orderInfo.getUserId());