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

打印逻辑修改

Browse Source
This commit is contained in:
SongZhang
2024-09-28 13:29:47 +08:00
parent 6c2e3b13af
commit 3caef07928
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -726,6 +726,7 @@ public class CartService {
// 查询历史orderDetail // 查询历史orderDetail
Integer finalOrderId = orderId; Integer finalOrderId = orderId;
List<TbOrderDetail> oldOrderDetailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>() List<TbOrderDetail> oldOrderDetailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
.eq(TbOrderDetail::getStatus, "unpaid")
.and(q -> q.in(TbOrderDetail::getCartId, cashierIds).or().eq(TbOrderDetail::getOrderId, finalOrderId)) .and(q -> q.in(TbOrderDetail::getCartId, cashierIds).or().eq(TbOrderDetail::getOrderId, finalOrderId))
.eq(TbOrderDetail::getShopId, shopId)); .eq(TbOrderDetail::getShopId, shopId));
HashMap<String, TbOrderDetail> oldOrderDetailMap = new HashMap<>(); HashMap<String, TbOrderDetail> oldOrderDetailMap = new HashMap<>();
@@ -734,7 +735,7 @@ public class CartService {
oldOrderDetailList.forEach(item -> { oldOrderDetailList.forEach(item -> {
oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item); oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item);
if (cashierCartList.contains(item.getCartId())) { if (cashierIds.contains(item.getCartId())) {
oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item); oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item);
} else { } else {
removeOrderDetailList.add(item); removeOrderDetailList.add(item);
@@ -1052,12 +1053,14 @@ public class CartService {
// 打印票据 // 打印票据
if (!addOrderDetail.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) { if (!addOrderDetail.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
log.info("待打印菜品信息: {}", addOrderDetail);
mQUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetail.toArray(new TbOrderDetail[0])); mQUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetail.toArray(new TbOrderDetail[0]));
} }
if (!removeOrderDetailList.isEmpty()) { if (!removeOrderDetailList.isEmpty()) {
log.info("待打印退菜菜品信息: {}", removeOrderDetailList);
// 退单票 // 退单票
mpOrderDetailMapper.deleteBatchIds(removeOrderDetailList.stream().map(tbOrderDetail -> tbOrderDetail.getId()).collect(Collectors.toList())); mpOrderDetailMapper.deleteBatchIds(removeOrderDetailList.stream().map(TbOrderDetail::getId).collect(Collectors.toList()));
if (shopEatTypeInfoDTO.isDineInAfter()) { if (shopEatTypeInfoDTO.isDineInAfter()) {
mQUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0])); mQUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0]));
} }