fix: 订单列表接口返回就餐类型字段

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java

@@ -14,10 +14,7 @@ import cn.ysk.cashier.mapper.order.TbOrderInfoMapper;
 import cn.ysk.cashier.mapper.product.TbProductMapper;
 import cn.ysk.cashier.mapper.product.TbProductSkuMapper;
 import cn.ysk.cashier.mybatis.entity.*;
-import cn.ysk.cashier.mybatis.mapper.TbCashierCartMapper;
+import cn.ysk.cashier.mybatis.mapper.*;
-import cn.ysk.cashier.mybatis.mapper.TbMShopUserMapper;
-import cn.ysk.cashier.mybatis.mapper.TbOrderDetailMapper;
-import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper;
 import cn.ysk.cashier.mybatis.service.*;
 import cn.ysk.cashier.mybatis.service.impl.MpOrderDetailServiceImpl;
 import cn.ysk.cashier.pojo.TbShopPayType;
@@ -27,6 +24,7 @@ import cn.ysk.cashier.pojo.order.TbOrderDetail;
 import cn.ysk.cashier.pojo.order.TbOrderInfo;
 import cn.ysk.cashier.pojo.product.TbProduct;
 import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.pojo.shop.TbShopInfo;
 import cn.ysk.cashier.pojo.shop.TbShopUser;
 import cn.ysk.cashier.repository.TbShopPayTypeRepository;
 import cn.ysk.cashier.repository.order.TbCashierCartRepository;
@@ -108,6 +106,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
     private final MpOrderDetailService mpOrderDetailService;
     private final TbOrderDetailMapper tbOrderDetailMapper;
     private final MpCashierCartService mpCashierCartService;
+    private final MpShopInfoMapper mpShopInfoMapper;
 
     @Value("${thirdPay.url}")
     private String url;
@@ -166,6 +165,13 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
             return predicate;
         }, pageable);
 
+        List<String> shopIds = page.getContent().stream().map(TbOrderInfo::getShopId).distinct().collect(Collectors.toList());
+        HashMap<String, TbShopInfo> shopInfoMap = new HashMap<>();
+        if (!shopIds.isEmpty()) {
+            mpShopInfoMapper.selectBatchIds(shopIds).forEach(item -> {
+                shopInfoMap.put(item.getId().toString(), item);
+            });
+        }
         List<TbOrderInfoVo> orderInfoVoList = new ArrayList<>();
         for (TbOrderInfo tbOrderInfo : page.getContent()) {
             TbOrderInfoVo orderInfoVo = new TbOrderInfoVo();
@@ -208,6 +214,10 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
             orderInfoVo.setSeatInfo(seatInfo);
             BeanUtils.copyProperties(tbOrderInfo, orderInfoVo);
             orderInfoVo.setRefundAmount(refundAmount);
+            TbShopInfo shopInfo = shopInfoMap.get(tbOrderInfo.getShopId());
+            if (shopInfo != null) {
+                orderInfoVo.setRegisterType(shopInfo.getRegisterType());
+            }
             orderInfoVoList.add(orderInfoVo);
         }
         return PageUtil.toPage(orderInfoVoList, page.getTotalElements());

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

@@ -660,7 +660,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             throw new BadRequestException("最大退菜数量为: {}", cashierCart.getNumber());
         }
 
-
         if (cashierCart.getOrderId() == null) {
             throw new BadRequestException("此商品还未下单，无需退单");
         }

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderInfoVo.java

@@ -117,4 +117,5 @@ public class TbOrderInfoVo  {
     private List<? extends TbOrderDetail> detailList;
 
     private TbOrderDetail seatInfo;
+    private String registerType;
 }