Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
330200a11d
|
|
@ -10,7 +10,7 @@
|
|||
WHERE shop_id = #{shopId}
|
||||
AND is_del = 0
|
||||
AND status = 2
|
||||
AND NOW() BETWEEN valid_start_time AND valid_end_time
|
||||
AND CURDATE() 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}, '%')
|
||||
|
|
|
|||
Loading…
Reference in New Issue