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

Browse Source
This commit is contained in:
张松
2025-12-01 17:39:15 +08:00
parent 29c6baf2c8 f98241efd1
commit c2960553b7
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
View File

@@ -30,5 +30,6 @@
</if>
</if>
group by o.id
order by o.booking_time desc
</select>
</mapper>

11
cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
View File

@@ -100,7 +100,16 @@
<if test="isNoTable != null">
AND `table`.`table_code` is null
</if>
GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.place_num
GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.id
ORDER BY
CASE detail.sub_status
WHEN 'READY_TO_SERVE' THEN 1
WHEN 'PENDING_PREP' THEN 2
WHEN 'SENT_OUT' THEN 3
WHEN 'DELIVERED' THEN 4
ELSE 5
END ASC,
CASE WHEN detail.sub_status = 'READY_TO_SERVE' THEN detail.start_order_time END ASC
</select>