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

客座费选择接口修改

This commit is contained in:
SongZhang 2024-10-24 09:43:05 +08:00
parent d2eae1734e
commit bc90c47f2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/enums/OrderStatusEnums.java
View File

@ -6,7 +6,7 @@ import lombok.Getter;
public enum OrderStatusEnums { public enum OrderStatusEnums {
REFUNDING("refunding"), REFUNDING("refunding"),
REFUND("refund"), REFUND("refund"),
CLOSED("closed"), CREATE("create"); CLOSED("closed"), CREATE("create"), RETURN("return");
private final String value; private final String value;
OrderStatusEnums(String value) { OrderStatusEnums(String value) {

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

@ -1801,7 +1801,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getSkuId, "-999") .eq(TbCashierCart::getSkuId, "-999")
.eq(TbCashierCart::getUseType, choseCountDTO.getUseType()) .eq(TbCashierCart::getUseType, choseCountDTO.getUseType())
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.eq(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, OrderStatusEnums.CREATE.getValue(), OrderStatusEnums.RETURN.getValue())
.eq(TbCashierCart::getTableId, choseCountDTO.getTableId()); .eq(TbCashierCart::getTableId, choseCountDTO.getTableId());
TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query); TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query);