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

fix: 称重商品购物车增加标识

Browse Source
This commit is contained in:
张松
2024-12-19 17:55:08 +08:00
parent f78396a4ba
commit 75cd5ca22e
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
View File

@@ -185,6 +185,9 @@ public class TbCashierCart implements Serializable {
private String proGroupInfo; private String proGroupInfo;
// 商品类型 // 商品类型
private String typeEnum; private String typeEnum;
// 是否称重商品
private Integer isWeight;
public void copy(TbCashierCart source) { public void copy(TbCashierCart source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));

1
eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
View File

@@ -142,6 +142,7 @@ public class TbOrderDetail implements Serializable {
private Integer isThirdCoupon; private Integer isThirdCoupon;
private Integer isWaitCall; private Integer isWaitCall;
private String proGroupInfo; private String proGroupInfo;
private Integer isWeight;
public void copy(TbOrderDetail source){ public void copy(TbOrderDetail source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -638,6 +638,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (tbShopUnit != null) { if (tbShopUnit != null) {
tbCashierCart.setUnit(tbShopUnit.getName()); tbCashierCart.setUnit(tbShopUnit.getName());
} }
tbCashierCart.setIsWeight("weigh".equals(product.getType()) ? 1 : 0);
tbCashierCart.setTypeEnum(product.getTypeEnum()); tbCashierCart.setTypeEnum(product.getTypeEnum());
tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
tbCashierCart.setCoverImg(product.getCoverImg()); tbCashierCart.setCoverImg(product.getCoverImg());
@@ -1699,6 +1700,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId())); orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId()));
} }
orderDetail.setIsWeight(cashierCart.getIsWeight());
orderDetail.setProGroupInfo(cashierCart.getProGroupInfo()); orderDetail.setProGroupInfo(cashierCart.getProGroupInfo());
orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount()); orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount());
orderDetail.setIsWaitCall(cashierCart.getIsWaitCall()); orderDetail.setIsWaitCall(cashierCart.getIsWaitCall());