diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java index 8d778c6..fdf8dda 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java @@ -89,6 +89,7 @@ public class TbCashierCart implements Serializable { private String proGroupInfo; private String typeEnum; private Integer groupType; + private int isWeight; public void copy(TbCashierCart source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java index 3abbb62..b5df074 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java @@ -67,5 +67,5 @@ public class TbOrderDetail implements Serializable { private BigDecimal discountSaleAmount; private String discountSaleNote; private String proGroupInfo; - + private int isWeight; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 1b1bbda..8eb0bae 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -544,6 +544,8 @@ public class OrderService { cashierCart.setTableId(tableId); cashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue()); if (product != null) { + cashierCart.setIsWeight("weigh".equals(product.getType()) ? 1 : 0); + resetGroupProductCart(groupProductIdList, product, cashierCart); } list.add(cashierCart); @@ -1087,6 +1089,7 @@ public class OrderService { if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) { saleAmount = saleAmount.add(shopInfo.getTableFee()); } + orderDetail.setIsWeight(cashierCart.getIsWeight()); orderDetail.setProGroupInfo(cashierCart.getProGroupInfo()); orderDetail.setIsTemporary(cashierCart.getIsTemporary());