fix: 台桌关联订单查询修改
This commit is contained in:
@@ -231,7 +231,7 @@
|
||||
<select id="selectTableInfo" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO">
|
||||
select a.*, b.user_id, b.master_id, b.id as orderId, b.order_no as orderNo, b.amount as orderAmount from tb_shop_table a
|
||||
left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid') and b.master_id is not null
|
||||
and b.shop_id=#{shopId} and b.trade_day=#{day} and b.use_type!='takeout' and b.order_type='cash' and b.created_at > UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) * 1000
|
||||
and b.shop_id=#{shopId} and b.use_type!='takeout' and b.created_at > UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) * 1000
|
||||
where a.shop_id=#{shopId}
|
||||
<if test="areaId != null and areaId !=''">
|
||||
and a.area_id = #{areaId}
|
||||
@@ -242,6 +242,6 @@
|
||||
and a.status = #{status}
|
||||
</if>
|
||||
GROUP BY a.id
|
||||
order by a.id desc
|
||||
order by b.created_at desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user