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

Browse Source
This commit is contained in:
Tankaikai
2024-12-05 09:53:38 +08:00
parent c0d036a972 c540e07fa8
commit 003e344d9d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
View File

@@ -87,6 +87,8 @@ public class TbCashierCart implements Serializable {
private String useCouponInfo; private String useCouponInfo;
private int isThirdCoupon; private int isThirdCoupon;
private String proGroupInfo; private String proGroupInfo;
private String typeEnum;
private Integer groupType;
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));

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

@@ -391,7 +391,7 @@ public class OrderService {
} }
if (Objects.nonNull(cart)) { if (Objects.nonNull(cart) && cart.getGroupType() != null && cart.getGroupType() == 0) {
//查询现有规格商品 //查询现有规格商品
cart.setNumber(number); cart.setNumber(number);
cart.setIsGift(isGift); cart.setIsGift(isGift);
@@ -408,7 +408,7 @@ public class OrderService {
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create"); List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
TbCashierCart cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO); TbCashierCart cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO);
// 不存在新增 // 不存在新增
if (Objects.isNull(cashierCart)) { if (Objects.isNull(cashierCart) || (cart != null && cart.getGroupType() != null && cart.getGroupType() == 1)) {
cashierCart = new TbCashierCart(); cashierCart = new TbCashierCart();
cashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); cashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
if (product != null) { if (product != null) {
@@ -416,6 +416,8 @@ public class OrderService {
cashierCart.setIsSku(product.getTypeEnum()); cashierCart.setIsSku(product.getTypeEnum());
cashierCart.setName(product.getName()); cashierCart.setName(product.getName());
cashierCart.setCategoryId(product.getCategoryId()); cashierCart.setCategoryId(product.getCategoryId());
cashierCart.setTypeEnum(product.getTypeEnum());
cashierCart.setGroupType(product.getGroupType());
} }
cashierCart.setCreatedAt(System.currentTimeMillis()); cashierCart.setCreatedAt(System.currentTimeMillis());
cashierCart.setMasterId(masterId); cashierCart.setMasterId(masterId);