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

1.代客下单 挂起订单增加masterId

Browse Source
This commit is contained in:
SongZhang
2024-08-29 11:27:51 +08:00
parent a0274410a8
commit 0fe0722893
2 changed files with 10 additions and 8 deletions
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

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

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

@@ -901,13 +901,16 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (isFirst) {
// 后付费，不增加当前台桌取餐号
if (createOrderDTO.isPostPay()) {
// addGlobalCode(day, "pc", String.valueOf(createOrderDTO.getShopId()));
String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
redisTemplate.delete(key);
} else {
addGlobalCode(day, "pc", String.valueOf(createOrderDTO.getShopId()));
// String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
// redisTemplate.delete(key);
}
if (!createOrderDTO.isPostPay() || addMaterId){
String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + orderInfo.getTableId();
redisTemplate.delete(key);
}
}
// 推送耗材信息
@@ -1021,6 +1024,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
rabbitMsgUtils.printTicket(String.valueOf(orderId));
}
return orderInfoMapper.selectById(orderId);
}
@@ -1097,9 +1101,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
// 打印消息
rabbitMsgUtils.sendOrderCollectMsg(jsonObject);
if (StrUtil.isBlank(orderInfo.getUseType()) || orderInfo.getUseType().equals("afterPay")) {
rabbitMsgUtils.printTicket(String.valueOf(orderInfo.getId()));
}
rabbitMsgUtils.printTicket(String.valueOf(orderInfo.getId()));
// 发送库存记录mq消息
JSONObject mqData = new JSONObject();