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-22 17:38:24 +08:00
parent 23a0aeae48 0d8f030b77
commit 48c5f09687
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cash-service/market-service/src/main/resources/mapper/MkProductSmartSuggestMapper.xml
View File

@ -9,11 +9,10 @@
WHERE shop_id = #{shopId} WHERE shop_id = #{shopId}
AND is_del = 0 AND is_del = 0
AND status = 1 AND status = 1
AND NOW() 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 FIND_IN_SET(#{week}, use_days) > 0 AND FIND_IN_SET(#{week}, use_days) > 0
ORDER BY sort, ORDER BY id,
update_time DESC, update_time DESC,
create_time DESC create_time DESC
</select> </select>