czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-10-30 16:30:57 +08:00
parent f628b57673 8c04903988
commit 330200a11d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml
View File

@ -10,7 +10,7 @@
WHERE shop_id = #{shopId} WHERE shop_id = #{shopId}
AND is_del = 0 AND is_del = 0
AND status = 2 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 AND (use_time_type = 'all' OR
(use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
AND use_days LIKE CONCAT('%', #{useDay}, '%') AND use_days LIKE CONCAT('%', #{useDay}, '%')