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

This commit is contained in:
张松
2025-12-02 10:05:32 +08:00

View File

@@ -38,7 +38,16 @@
<if test="productName != null and productName != ''">
AND detail.product_name like concat('%',#{productName},'%')
</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>