From 9e25471e1e05388a7a4cae53e6ad342da7cef9d5 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 20 Sep 2024 17:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/controller/product/TbPlaceController.java | 5 ++---
 .../cn/ysk/cashier/service/impl/SummaryServiceImpl.java   | 8 ++------
 .../service/impl/shopimpl/TbShopTableServiceImpl.java     | 4 ++--
 .../cn/ysk/cashier/service/shop/TbShopTableService.java   | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 9a061710..cbf25d89 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -147,10 +147,9 @@ public class TbPlaceController {
     public ResponseEntity<Object> getMasterId(
             @RequestParam Integer shopId,
             @RequestParam Long tableId,
-            @RequestParam(defaultValue = "") String useType,
-            @RequestParam(required = false) Integer vipUserId
+            @RequestParam(defaultValue = "") String useType
     ) {
-        return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, vipUserId, useType));
+        return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, useType));
     }
 
     @AnonymousAccess
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index c4965f31..34c03540 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -1,14 +1,14 @@
 package cn.ysk.cashier.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.ysk.cashier.dto.BaseQueryDto;
 import cn.ysk.cashier.dto.ShopSummaryDto;
+import cn.ysk.cashier.dto.shop.ExportTableStsDataDto;
 import cn.ysk.cashier.dto.shop.ShopTableSaleInfoDto;
 import cn.ysk.cashier.enums.PayTypeEnum;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper;
 import cn.ysk.cashier.mybatis.service.TbShopUserFlowService;
-import cn.ysk.cashier.repository.ShopUserDutyDetailRepository;
-import cn.ysk.cashier.repository.ShopUserDutyRepository;
 import cn.ysk.cashier.repository.TbTokenRepository;
 import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
 import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
@@ -46,10 +46,6 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @Slf4j
 public class SummaryServiceImpl implements SummaryService {
-    @Resource
-    private ShopUserDutyRepository shopUserDutyRepository;
-    @Resource
-    private ShopUserDutyDetailRepository shopUserDutyDetailRepository;
     @Resource
     private TbShopUserRepository tbShopUserRepository;
     @Resource
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 4d7d35ea..9d5b202e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -904,7 +904,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
     private final StringRedisTemplate redisTemplate;
 
     @Override
-    public JSONObject getMasterId(Integer shopId, Long tableId, Integer vipUserId, String useType) {
+    public JSONObject getMasterId(Integer shopId, Long tableId,String useType) {
         String account = tokenProvider.getSubject();
         if (account == null) {
             throw new BadRequestException("token解析失败");
@@ -1513,7 +1513,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     public Object choseTable(ChoseTableDTO choseTableDTO) {
-        String masterId = getMasterId(choseTableDTO.getShopId(), Long.valueOf(choseTableDTO.getNewTableId()), null, "").getString("masterId");
+        String masterId = getMasterId(choseTableDTO.getShopId(), Long.valueOf(choseTableDTO.getNewTableId()), null).getString("masterId");
         String currentOrderId = choseTableDTO.getOrderId() == null ? getCurrentOrderId(choseTableDTO.getOldTableId(),
                 choseTableDTO.getShopId().toString()) : choseTableDTO.getOrderId().toString();
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
index 6ea74182..ca463849 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
@@ -112,7 +112,7 @@ public interface TbShopTableService {
 
     Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint);
 
-    JSONObject getMasterId(Integer shopId, Long tableId, Integer vipUserId, String useType);
+    JSONObject getMasterId(Integer shopId, Long tableId, String useType);
 
     Object pending(PendingDTO pendingDTO);