From 5ccdef60ae87a69c54ecf7d5b13060ec0dfac462 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 14 Nov 2025 16:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA?=
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, 3 insertions(+), 6 deletions(-)

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 7fde853d9..aff5d5820 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
@@ -316,7 +316,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException {
+    public OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException, CzgException {
         AssertUtil.isNull(param.getOrderId(), "支付失败，订单id不能为空");
         OrderInfo orderInfo = getById(param.getOrderId());
         if (!orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
@@ -535,9 +535,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         upOrderPayInfo(orderInfo, param);
 
 
-
-
-
         orderDetailService.updateBatch(orderDetails);
         return orderInfo;
     }
@@ -601,7 +598,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      */
     private void couponExecute(List<OrderDetail> orderDetails, CheckOrderPay param, BigDecimalDTO totalAmount, BigDecimalDTO tempAmount,
                                BigDecimalDTO prodCouponAmount, BigDecimalDTO oneGiftAmount, BigDecimalDTO twoHalfAmount,
-                               BigDecimalDTO rateAmount, BigDecimalDTO fullReductionAmount) {
+                               BigDecimalDTO rateAmount, BigDecimalDTO fullReductionAmount) throws CzgException {
         if (CollUtil.isNotEmpty(param.getCouponList()) && (!param.isFreeDine() || param.isWithCoupon())) {
             QueryWrapper couponRecordQuery = new QueryWrapper();
             couponRecordQuery.in(MkShopCouponRecord::getId, param.getCouponList());
@@ -762,7 +759,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      * @param isVipShare          门槛计算是否与会员价共享
      */
     private void thresholdCalculation(List<OrderDetail> orderDetails, BigDecimal fullAmount, boolean isAllFoods, List<Long> couponFoodIds,
-                                      boolean isVipPrice, boolean isTimeDiscountShare, boolean isVipShare, String title) {
+                                      boolean isVipPrice, boolean isTimeDiscountShare, boolean isVipShare, String title) throws CzgException {
         BigDecimal calculationAmount = BigDecimal.ZERO;
         for (OrderDetail orderDetail : orderDetails) {
             if (orderDetail.getIsGift() == 1 || orderDetail.getIsTemporary() == 1) {