1.代客下单 挂单不增加masterId
This commit is contained in:
parent
7d37e58206
commit
edadbb5662
|
|
@ -142,7 +142,7 @@ public class TbPlaceController {
|
|||
public ResponseEntity<Object> createOrder(
|
||||
@RequestBody CreateOrderDTO createOrderDTO
|
||||
) {
|
||||
return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO));
|
||||
return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, true));
|
||||
}
|
||||
|
||||
@AnonymousAccess
|
||||
|
|
|
|||
|
|
@ -710,7 +710,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||
|
||||
|
||||
@Override
|
||||
public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO) {
|
||||
public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId) {
|
||||
|
||||
String day = DateUtils.getDay();
|
||||
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
|
||||
|
|
@ -839,7 +839,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||
cashierCart.setUpdatedAt(System.currentTimeMillis());
|
||||
cashierCartMapper.updateById(cashierCart);
|
||||
}
|
||||
if (isFirst) {
|
||||
if (isFirst && addMaterId) {
|
||||
String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + createOrderDTO.getTableId();
|
||||
|
||||
redisTemplate.delete(key);
|
||||
|
|
@ -904,7 +904,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||
createOrderDTO.setShopId(pendingDTO.getShopId());
|
||||
createOrderDTO.setMasterId(pendingDTO.getMasterId());
|
||||
createOrderDTO.setVipUserId(pendingDTO.getVipUserId());
|
||||
orderId = createOrder(createOrderDTO).getId();
|
||||
orderId = createOrder(createOrderDTO, false).getId();
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public interface TbShopTableService {
|
|||
|
||||
void pack(PackCartDTO packCartDTO);
|
||||
|
||||
Object createOrder(CreateOrderDTO createOrderDTO);
|
||||
Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId);
|
||||
|
||||
Object getMasterId(Integer shopId, Long tableId, Integer vipUserId);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue