diff --git a/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml index ba3ea07a7..5c436f160 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml @@ -19,7 +19,7 @@ AND (use_time_type = 'all' OR (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) AND FIND_IN_SET(#{useDay}, use_days) > 0 - ORDER BY sort, + ORDER BY sort DESC, update_time DESC, create_time DESC LIMIT 1; 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 b9372a720..ca41ab5aa 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 @@ -401,7 +401,8 @@ public class OrderInfoServiceImpl extends ServiceImpl