From 76d69a7c5c37d3a112693914732cbe99bbdd5005 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 29 Sep 2025 15:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=BB=B6=E5=8D=8A=E4=BB=B7?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d305e32f2..bc01d2f72 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
@@ -463,7 +463,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (param.getOriginAmount().subtract(param.getProductCouponDiscountAmount()).subtract(param.getOtherCouponDiscountAmount()).compareTo(newTotalAmount) != 0) {
             log.info("其它优惠券金额不正确：满减金额为：{}，折扣金额为：{}，买一赠一金额为：{}，第二件半价券金额为:{} 传递为：{}",
                     fullReductionAmount.getPrice(), rateAmount.getPrice(), oneGiftAmount.getPrice(), twoHalfAmount.getPrice(), param.getOtherCouponDiscountAmount());
-            throw new ValidateException("生成支付订单失败，商品优惠券优惠金额不正确");
+            throw new ValidateException("生成支付订单失败，其它优惠券金额不正确");
         }
         //新客立减
         if (shopUser != null) {
@@ -677,7 +677,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private void twoHalfCalculate(List<OrderDetail> orderDetails, boolean isAllFoods, List<Long> couponFoodIds, boolean isAsc, BigDecimalDTO oneGiftAmount) {
         orderDetails = getDetailsSort(orderDetails, isAsc);
         for (OrderDetail detail : orderDetails) {
-            if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) && couponFoodIds.contains(detail.getProductId())
+            if ((isAllFoods || couponFoodIds.contains(detail.getProductId()))
                     && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0
                     && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) {
                 detail.setHalfPriceCouponNum(BigDecimal.ONE);