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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
Tankaikai 2024-10-10 10:05:11 +08:00
parent 9dc0e46c76 f0fe3fa75b
commit c153597347
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -920,6 +920,9 @@ public class OrderService {
List<TbOrderDetail> removedOrderDetailList = oldOrderDetailList.stream().filter(item -> !cashierIds.contains(item.getCartId())).collect(Collectors.toList()); List<TbOrderDetail> removedOrderDetailList = oldOrderDetailList.stream().filter(item -> !cashierIds.contains(item.getCartId())).collect(Collectors.toList());
// 移除购物车的商品，返还库存 // 移除购物车的商品，返还库存
removedOrderDetailList.forEach(item -> { removedOrderDetailList.forEach(item -> {
if (TableConstant.CART_SEAT_ID.equals(item.getProductId().toString())) {
return;
}
productService.incrStock(item.getProductId().toString(), item.getProductSkuId().toString(), item.getNum()); productService.incrStock(item.getProductId().toString(), item.getProductSkuId().toString(), item.getNum());
}); });
@ -1766,7 +1769,8 @@ public class OrderService {
tbCashierCart.setNumber(choseCountDTO.getNum()); tbCashierCart.setNumber(choseCountDTO.getNum());
tbCashierCart.setTotalNumber(choseCountDTO.getNum()); tbCashierCart.setTotalNumber(choseCountDTO.getNum());
tbCashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue()); tbCashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue());
tbCashierCartMapper.insert(tbCashierCart); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
mpCashierCartMapper.insert(tbCashierCart);
} else { } else {
tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee())); tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee()));
tbCashierCart.setNumber(choseCountDTO.getNum()); tbCashierCart.setNumber(choseCountDTO.getNum());