1.代客下单相关接口

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -627,5 +627,9 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
 
 
 
+    </select>
+    <select id="selectActivateOrder" resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo">
+        SELECT * FROM `tb_order_info` where shop_id=#{shopId} and
+                                            table_id=#{tableId} and order_type != 'return' and `status` not in ('closed', 'refund', 'merge')
     </select>
 </mapper>