From a1c8f649ffa435751ba710ab7ba47fa3eb4436df Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 27 Oct 2025 18:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=98=E6=89=A3=20?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderInfoServiceImpl.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 c9798c9f..1d79cc05 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
@@ -795,9 +795,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         for (OrderDetail detail : orderDetails) {
             if (detail.getIsTemporary() != 1 && (isAllFoods || (CollUtil.isNotEmpty(couponFoodIds) && couponFoodIds.contains(detail.getProductId()))) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) {
                 if (remaining.compareTo(BigDecimal.ZERO) > 0) {
-                    if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
-                        continue;
-                    }
+//                    if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
+//                        continue;
+//                    }
                     if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) {
                         detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING));
                         detail.setDiscountAmount(detail.getPayAmount());
@@ -829,9 +829,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if ((isAllFoods || couponFoodIds.contains(detail.getProductId()))
                     && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0
                     && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) {
-                if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
-                    continue;
-                }
+//                if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
+//                    continue;
+//                }
                 detail.setCouponNum(detail.getCouponNum().add(BigDecimal.ONE));
                 detail.setDiscountAmount(detail.getDiscountAmount().add(detail.getUnitPrice()));
                 detail.setPayAmount(detail.getPayAmount().subtract(detail.getUnitPrice()));
@@ -851,9 +851,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if ((isAllFoods || couponFoodIds.contains(detail.getProductId()))
                     && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0
                     && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) {
-                if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
-                    continue;
-                }
+//                if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) {
+//                    continue;
+//                }
                 detail.setHalfPriceCouponNum(BigDecimal.ONE);
                 BigDecimal halfPrice = detail.getUnitPrice().divide(new BigDecimal("2"), 2, RoundingMode.FLOOR);
                 detail.setDiscountAmount(detail.getDiscountAmount().add(halfPrice));