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

feat: 台桌状态根据detail表判断

This commit is contained in:
张松 2024-11-18 11:40:40 +08:00
parent 0cae71cd52
commit 32448a62a9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
for (TbShopTable date : tbShopTableList) { for (TbShopTable date : tbShopTableList) {
if (StrUtil.isBlank(date.getQrcode())) { if (StrUtil.isBlank(date.getQrcode())) {
date.setStatus("unbind"); date.setStatus("unbind");
} else if ((countMap.get(date.getQrcode()) == null || countMap.get(date.getQrcode()) < 1) && !TableStateEnum.CLEANING.getState().equals(date.getStatus())) { } else if (countMap.get(date.getQrcode()) != null && countMap.get(date.getQrcode()) < 1 && !TableStateEnum.CLEANING.getState().equals(date.getStatus())) {
date.setStatus("idle"); date.setStatus("idle");
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>() mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, date.getQrcode()) .eq(TbShopTable::getQrcode, date.getQrcode())
@ -572,7 +572,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue()); tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
// tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1); // tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1);
tbCashierCart.setIsMember(addCartDTO.getVipUserId() == null ? 0 : 1); tbCashierCart.setIsMember(addCartDTO.getVipUserId() == null ? 0 : 1);
tbCashierCart.setMemberPrice(productSku.getMemberPrice()); if (tbCashierCart.getIsMember() == 1) {
tbCashierCart.setMemberPrice(productSku.getMemberPrice());
}
cashierCartRepository.save(tbCashierCart); cashierCartRepository.save(tbCashierCart);
} else { } else {
@ -612,12 +614,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
return tbCashierCart; return tbCashierCart;
} }
@Override
public TbCashierCart addTemporaryDishes(AddTemporaryDishesDTO temporaryDishesDTO) {
return null;
}
private void setRedisTableCartInfo(String tableId, String shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) { private void setRedisTableCartInfo(String tableId, String shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) {
String tableCartKey = RedisConstant.getTableCartKey(tableId, shopId); String tableCartKey = RedisConstant.getTableCartKey(tableId, shopId);
String tableCart = redisTemplate.opsForValue().get(tableCartKey); String tableCart = redisTemplate.opsForValue().get(tableCartKey);
@ -1522,9 +1518,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setUseType(cashierCart.getUseType()); orderDetail.setUseType(cashierCart.getUseType());
orderDetail.setProductImg(cashierCart.getCoverImg()); orderDetail.setProductImg(cashierCart.getCoverImg());
orderDetail.setCartId(cashierCart.getId()); orderDetail.setCartId(cashierCart.getId());
orderDetail.setIsMember(cashierCart.getIsMember());
orderDetail.setOrderId(orderInfo == null ? null : orderInfo.getId()); orderDetail.setOrderId(orderInfo == null ? null : orderInfo.getId());
orderDetail.setIsMember(cashierCart.getIsMember());
priceDTO.getOrderDetailList().add(orderDetail); priceDTO.getOrderDetailList().add(orderDetail);
} }
return priceDTO; return priceDTO;
@ -2022,8 +2016,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setProductCouponDiscountAmount(productDiscount); orderInfo.setProductCouponDiscountAmount(productDiscount);
// 更新订单信息 // 更新订单信息
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(orderInfo.getShopId(), orderInfo.getTableId());
OrderPriceDTO priceDTO = createOrderDetailWithCoupon(activateCartInfo, orderInfo, payDTO.getShopId(), false, shopEatTypeInfoDTO); OrderPriceDTO priceDTO = createOrderDetailWithCoupon(activateCartInfo, orderInfo, payDTO.getShopId(), false, null);
BigDecimal finalAmount = priceDTO.getTotalAmount().multiply(BigDecimal.valueOf(payDTO.getDiscount())).setScale(2, RoundingMode.HALF_UP); BigDecimal finalAmount = priceDTO.getTotalAmount().multiply(BigDecimal.valueOf(payDTO.getDiscount())).setScale(2, RoundingMode.HALF_UP);
orderInfo.setUpdatedAt(System.currentTimeMillis()); orderInfo.setUpdatedAt(System.currentTimeMillis());