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

餐位费设置

Browse Source
This commit is contained in:
SongZhang
2024-09-27 13:35:57 +08:00
parent 3412b88d08
commit 42fbfcbe1a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,4 @@ public class ChoseCountDTO {
@NotNull @NotNull
@Min(1) @Min(1)
private Integer num; private Integer num;
@NotNull
private String userId;
} }

8
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -892,13 +892,15 @@ public class ProductService {
throw new MsgException("当前台桌最大人数为: " + shopTable.getMaxCapacity()); throw new MsgException("当前台桌最大人数为: " + shopTable.getMaxCapacity());
} }
Integer userId = TokenUtil.getUserId();
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, choseCountDTO.getShopId()) .eq(TbCashierCart::getShopId, choseCountDTO.getShopId())
.eq(TbCashierCart::getProductId, "-999") .eq(TbCashierCart::getProductId, "-999")
.eq(TbCashierCart::getSkuId, "-999") .eq(TbCashierCart::getSkuId, "-999")
.eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getStatus, "create")
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(r -> r.eq(TbCashierCart::getUserId, choseCountDTO.getUserId()).or().isNull(TbCashierCart::getUserId)) .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId))
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.eq(TbCashierCart::getTableId, choseCountDTO.getTableId()); .eq(TbCashierCart::getTableId, choseCountDTO.getTableId());
TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query); TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query);
@@ -922,7 +924,7 @@ public class ProductService {
tbCashierCart.setTotalNumber(choseCountDTO.getNum()); tbCashierCart.setTotalNumber(choseCountDTO.getNum());
tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue()); tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue());
tbCashierCart.setUserId(Integer.valueOf(choseCountDTO.getUserId())); tbCashierCart.setUserId(userId);
mpCashierCartMapper.insert(tbCashierCart); mpCashierCartMapper.insert(tbCashierCart);
} else { } else {
tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee())); tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee()));
@@ -930,7 +932,7 @@ public class ProductService {
tbCashierCart.setTotalNumber(choseCountDTO.getNum()); tbCashierCart.setTotalNumber(choseCountDTO.getNum());
tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue()); tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue());
tbCashierCart.setUserId(Integer.valueOf(choseCountDTO.getUserId())); tbCashierCart.setUserId(userId);
mpCashierCartMapper.updateById(tbCashierCart); mpCashierCartMapper.updateById(tbCashierCart);
} }