From 46820794d7b36f2ea1235131304a9c67abaaac2a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 23 Oct 2025 11:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=20=E5=8F=96=E6=B6=88=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MkDiscountActivityMapper.xml | 6 +++--- .../service/order/service/impl/OrderInfoServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml index bae252c28..b28270ed2 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml @@ -11,9 +11,9 @@ AND is_del = 0 AND status = 2 AND NOW() BETWEEN valid_start_time AND valid_end_time - AND (use_time_type = 'all' OR - (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) - AND use_days LIKE CONCAT('%', #{useDay}, '%') +# AND (use_time_type = 'all' OR +# (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) +# AND use_days LIKE CONCAT('%', #{useDay}, '%') ORDER BY sort DESC, update_time DESC, create_time DESC 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 4779a26dc..35ffab3eb 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 @@ -639,7 +639,7 @@ public class OrderInfoServiceImpl extends ServiceImpl