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

1.代客下单 挂单不增加masterId

This commit is contained in:
SongZhang 2024-08-21 11:02:38 +08:00
parent 7d37e58206
commit edadbb5662
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ public class TbPlaceController {
public ResponseEntity<Object> createOrder( public ResponseEntity<Object> createOrder(
@RequestBody CreateOrderDTO createOrderDTO @RequestBody CreateOrderDTO createOrderDTO
) { ) {
return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO)); return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, true));
} }
@AnonymousAccess @AnonymousAccess

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

@ -710,7 +710,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO) { public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId) {
String day = DateUtils.getDay(); String day = DateUtils.getDay();
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
@ -839,7 +839,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
cashierCart.setUpdatedAt(System.currentTimeMillis()); cashierCart.setUpdatedAt(System.currentTimeMillis());
cashierCartMapper.updateById(cashierCart); cashierCartMapper.updateById(cashierCart);
} }
if (isFirst) { if (isFirst && addMaterId) {
String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + createOrderDTO.getTableId(); String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + createOrderDTO.getTableId();
redisTemplate.delete(key); redisTemplate.delete(key);
@ -904,7 +904,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
createOrderDTO.setShopId(pendingDTO.getShopId()); createOrderDTO.setShopId(pendingDTO.getShopId());
createOrderDTO.setMasterId(pendingDTO.getMasterId()); createOrderDTO.setMasterId(pendingDTO.getMasterId());
createOrderDTO.setVipUserId(pendingDTO.getVipUserId()); createOrderDTO.setVipUserId(pendingDTO.getVipUserId());
orderId = createOrder(createOrderDTO).getId(); orderId = createOrder(createOrderDTO, false).getId();
} }

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

@ -108,7 +108,7 @@ public interface TbShopTableService {
void pack(PackCartDTO packCartDTO); void pack(PackCartDTO packCartDTO);
Object createOrder(CreateOrderDTO createOrderDTO); Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId);
Object getMasterId(Integer shopId, Long tableId, Integer vipUserId); Object getMasterId(Integer shopId, Long tableId, Integer vipUserId);