diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java index 23d579ad..50c9bb49 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java @@ -183,6 +183,8 @@ public class TbCashierCart implements Serializable { private Integer isWaitCall; // 套餐商品,选择的商品信息 private String proGroupInfo; + // 商品类型 + private String typeEnum; public void copy(TbCashierCart source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 7a15b760..1b162722 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -610,7 +610,11 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (tbCashierCart == null) { tbCashierCart = new TbCashierCart(); resetGroupProductCart(addCartDTO.getGroupProductIdList(), product, tbCashierCart); - + TbShopUnit tbShopUnit = mpShopUnitMapper.selectById(product.getId()); + if (tbShopUnit != null) { + tbCashierCart.setUnit(tbShopUnit.getName()); + } + tbCashierCart.setTypeEnum(product.getTypeEnum()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setCoverImg(product.getCoverImg()); tbCashierCart.setCreatedAt(System.currentTimeMillis());