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 a761734b..e955535e 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 @@ -185,6 +185,9 @@ public class TbCashierCart implements Serializable { private String proGroupInfo; // 商品类型 private String typeEnum; + // 是否称重商品 + private Integer isWeight; + public void copy(TbCashierCart source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java index 893a5049..3935ffe7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java @@ -142,6 +142,7 @@ public class TbOrderDetail implements Serializable { private Integer isThirdCoupon; private Integer isWaitCall; private String proGroupInfo; + private Integer isWeight; public void copy(TbOrderDetail 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 e61a2cb0..c828bf3c 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 @@ -638,6 +638,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (tbShopUnit != null) { tbCashierCart.setUnit(tbShopUnit.getName()); } + tbCashierCart.setIsWeight("weigh".equals(product.getType()) ? 1 : 0); tbCashierCart.setTypeEnum(product.getTypeEnum()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setCoverImg(product.getCoverImg()); @@ -1699,6 +1700,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId())); } + orderDetail.setIsWeight(cashierCart.getIsWeight()); orderDetail.setProGroupInfo(cashierCart.getProGroupInfo()); orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount()); orderDetail.setIsWaitCall(cashierCart.getIsWaitCall());