czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码合并

This commit is contained in:
SongZhang 2024-09-20 17:43:27 +08:00
parent 546b63e336
commit 9e25471e1e
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

@ -147,10 +147,9 @@ public class TbPlaceController {
public ResponseEntity<Object> getMasterId( public ResponseEntity<Object> getMasterId(
@RequestParam Integer shopId, @RequestParam Integer shopId,
@RequestParam Long tableId, @RequestParam Long tableId,
@RequestParam(defaultValue = "") String useType, @RequestParam(defaultValue = "") String useType
@RequestParam(required = false) Integer vipUserId
) { ) {
return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, vipUserId, useType)); return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, useType));
} }
@AnonymousAccess @AnonymousAccess

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@ -1,14 +1,14 @@
package cn.ysk.cashier.service.impl; package cn.ysk.cashier.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.ysk.cashier.dto.BaseQueryDto;
import cn.ysk.cashier.dto.ShopSummaryDto; import cn.ysk.cashier.dto.ShopSummaryDto;
import cn.ysk.cashier.dto.shop.ExportTableStsDataDto;
import cn.ysk.cashier.dto.shop.ShopTableSaleInfoDto; import cn.ysk.cashier.dto.shop.ShopTableSaleInfoDto;
import cn.ysk.cashier.enums.PayTypeEnum; import cn.ysk.cashier.enums.PayTypeEnum;
import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper; import cn.ysk.cashier.mybatis.mapper.TbShopUserFlowMapper;
import cn.ysk.cashier.mybatis.service.TbShopUserFlowService; 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.TbTokenRepository;
import cn.ysk.cashier.repository.order.TbOrderDetailRepository; import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
import cn.ysk.cashier.repository.order.TbOrderInfoRepository; import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
@ -46,10 +46,6 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class SummaryServiceImpl implements SummaryService { public class SummaryServiceImpl implements SummaryService {
@Resource
private ShopUserDutyRepository shopUserDutyRepository;
@Resource
private ShopUserDutyDetailRepository shopUserDutyDetailRepository;
@Resource @Resource
private TbShopUserRepository tbShopUserRepository; private TbShopUserRepository tbShopUserRepository;
@Resource @Resource

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

@ -904,7 +904,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
private final StringRedisTemplate redisTemplate; private final StringRedisTemplate redisTemplate;
@Override @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(); String account = tokenProvider.getSubject();
if (account == null) { if (account == null) {
throw new BadRequestException("token解析失败"); throw new BadRequestException("token解析失败");
@ -1513,7 +1513,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
public Object choseTable(ChoseTableDTO choseTableDTO) { 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(), String currentOrderId = choseTableDTO.getOrderId() == null ? getCurrentOrderId(choseTableDTO.getOldTableId(),
choseTableDTO.getShopId().toString()) : choseTableDTO.getOrderId().toString(); choseTableDTO.getShopId().toString()) : choseTableDTO.getOrderId().toString();

2
eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
View File

@ -112,7 +112,7 @@ public interface TbShopTableService {
Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint); 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); Object pending(PendingDTO pendingDTO);