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