fix: 修复选择台桌购物车未查询出数据问题

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java

@@ -22,6 +22,14 @@ public interface MpCashierCartService extends IService<TbCashierCart> {
      */
     List<TbCashierCart> selectTakeoutCart(String masterId, Integer shopId);
 
+    /**
+     * 查询无台桌购物车商品
+     * @param masterId 取餐码
+     * @param shopId 店铺did
+     */
+    List<TbCashierCart> selectUnTableCart(String masterId, Integer shopId);
+
+
     /**
      * 统计当前台桌购物车数量
      * @param shopId 店铺id
@@ -39,5 +47,6 @@ public interface MpCashierCartService extends IService<TbCashierCart> {
      * @param shopId  店铺id
      */
     boolean clearCartByTableIdAndUseType(String tableId, String useType, Integer shopId);
+
 }
 

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java

@@ -1,16 +1,23 @@
 package cn.ysk.cashier.mybatis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.ysk.cashier.enums.OrderStatusEnums;
 import cn.ysk.cashier.enums.OrderUseTypeEnum;
+import cn.ysk.cashier.enums.ShopInfoEatModelEnum;
+import cn.ysk.cashier.enums.ShopInfoRegisterlEnum;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.mybatis.mapper.MpShopInfoMapper;
 import cn.ysk.cashier.mybatis.mapper.TbCashierCartMapper;
 import cn.ysk.cashier.mybatis.service.MpCashierCartService;
 import cn.ysk.cashier.pojo.order.TbCashierCart;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -21,6 +28,12 @@ import java.util.List;
  */
 @Service
 public class MpCashierCartServiceImpl extends ServiceImpl<TbCashierCartMapper, TbCashierCart> implements MpCashierCartService {
+    private final MpShopInfoMapper mpShopInfoMapper;
+
+    public MpCashierCartServiceImpl(MpShopInfoMapper mpShopInfoMapper) {
+        this.mpShopInfoMapper = mpShopInfoMapper;
+    }
+
     @Override
     public List<TbCashierCart> selectTakeoutCart(String masterId, Integer shopId) {
         return list(new LambdaQueryWrapper<TbCashierCart>()
@@ -30,6 +43,25 @@ public class MpCashierCartServiceImpl extends ServiceImpl<TbCashierCartMapper, T
                 .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()));
     }
 
+    @Override
+    public List<TbCashierCart> selectUnTableCart(String masterId, Integer shopId) {
+        TbShopInfo shopInfo = mpShopInfoMapper.selectOne(new LambdaQueryWrapper<TbShopInfo>()
+                .eq(TbShopInfo::getId, shopId)
+                .eq(TbShopInfo::getStatus, 1));
+        if (shopInfo == null) {
+            throw new BadRequestException("店铺信息不存在");
+        }
+
+        boolean isMunchies = StrUtil.isNotBlank(shopInfo.getRegisterType()) &&
+                ShopInfoRegisterlEnum.MUNCHIES.getValue().equals(shopInfo.getRegisterType());
+
+        return list(new LambdaQueryWrapper<TbCashierCart>()
+                .eq(TbCashierCart::getShopId, shopId)
+                .eq(TbCashierCart::getMasterId, masterId)
+                .eq(TbCashierCart::getUseType, isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue())
+                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()));
+    }
+
     @Override
     public long countByTableId(Integer shopId, String tableId, OrderStatusEnums... statusEnums) {
         LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java

@@ -1782,7 +1782,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             throw new BadRequestException("台桌不存在或不处于空闲状态");
         }
 
-        List<TbCashierCart> tbCashierCarts = mpCashierCartService.selectTakeoutCart(choseTableDTO.getMasterId(), choseTableDTO.getShopId());
+        List<TbCashierCart> tbCashierCarts = mpCashierCartService.selectUnTableCart(choseTableDTO.getMasterId(), choseTableDTO.getShopId());
         if (tbCashierCarts.isEmpty()) {
             throw new BadRequestException("购物车为空");
         }