pc不校验自取模式

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java

@@ -493,8 +493,6 @@ public class PrintMechineConsumer {
         List<TbOrderDetail> details = tbOrderDetailMapper.selectAllByOrderId(Integer.valueOf(orderId));
         if (ObjectUtil.isNotEmpty(details) && details.size() > 0) {
             details.parallelStream().forEach(it -> {
-
-
                 String categoryId = tbProductMapper.selectByPrimaryKey(Integer.valueOf(it.getProductId())).getCategoryId();
                 Long count = categoryInfos.stream().filter(c ->
                         c.getId().toString().equals(categoryId)

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -144,9 +144,10 @@ public class OrderService {
             throw new MsgException("店铺信息不存在");
         }
 
-        if (!shopInfo.getEatModel().contains(eatModel)) {
+        if (!"take-out".equals(eatModel) && !shopInfo.getEatModel().contains(eatModel)) {
             throw new MsgException("当前店铺未开启此就餐模式");
         }
+
         boolean isTakeout = ShopInfoEatModelEnum.TAKE_OUT.getValue().equals(eatModel);
         // 是否是快餐版/先付费
         boolean isMunchies = StrUtil.isNotBlank(shopInfo.getRegisterType()) &&

src/main/resources/mapper/TbShopTableMapper.xml

@@ -230,7 +230,8 @@
     </select>
   <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='postPay' and b.order_type='cash'
+    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
     where a.shop_id=#{shopId}
     <if test="areaId != null and areaId !=''">
       and a.area_id = #{areaId}