czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

台桌状态

Browse Source
This commit is contained in:
wangw
2025-05-09 11:07:58 +08:00
parent 4321847add
commit fc255e5969
11 changed files with 141 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java
View File

@@ -57,19 +57,30 @@ public class ShopTableDTO implements Serializable {
private BigDecimal predateAmount;
/**
* idle-空闲 using-使用中 subscribe预定，closed--关台， opening 开台中，cleaning 台桌清理中
* 未绑定：unbound
* 空闲：idle
* 点餐中：ordering
* 未结账：unsettled
* 支付中：paying
* 已结账 (待清台)：settled
* 关台：closed
*/
private String status;
/**
* 二维码
*/
private String qrcode;
private String tableCode;
/**
* 自动清台 0手动 1自动
*/
private Integer autoClear;
/**
* 自动清台时间 单位分钟 默认10
*/
private Integer autoClearTime;
}

9
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
View File

@@ -82,4 +82,13 @@ public class ShopConfig implements Serializable {
* 分店数据同步方式 auto-自动同步 manual-手动同步
*/
private String branchDataSyncMethod;
/**
* 台桌清理类型 'auto 自动 hand 手动' 默认auto
*/
private String tableClearType;
/**
* '自动清台 支付几分钟后 默认10分钟后'
*/
private Integer tableClearTime;
}

11
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
View File

@@ -301,4 +301,15 @@ public class ShopInfo implements Serializable {
@Column(ignore = true)
private String headShopName;
/**
* 台桌清理类型 'auto 自动 hand 手动' 默认auto
*/
@Column(ignore = true)
private String tableClearType;
/**
* '自动清台 支付几分钟后 默认10分钟后'
*/
@Column(ignore = true)
private Integer tableClearTime;
}

20
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
View File

@@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -67,7 +68,14 @@ public class ShopTable implements Serializable {
private BigDecimal predateAmount;
/**
* idle-空闲 using-使用中 subscribe预定，closed--关台， opening 开台中，cleaning 台桌清理中
* {@link com.czg.enums.ShopTableStatusEnum}
* 未绑定：unbound
* 空闲：idle
* 点餐中：ordering
* 未结账：unsettled
* 支付中：paying
* 已结账 (待清台)：settled
* 关台：closed
*/
private String status;
@@ -83,10 +91,9 @@ public class ShopTable implements Serializable {
private String tableCode;
/**
* 自动清台 0手动 1自动
* 清台时间(自动清台时使用)
*/
private Integer autoClear;
private LocalDateTime clearTime;
/**
* 使用时间
*/
@@ -118,7 +125,10 @@ public class ShopTable implements Serializable {
private Integer useNum;
public boolean canUseByStatus() {
return !ShopTableStatusEnum.CLOSED.equalsVal(status) && !ShopTableStatusEnum.CLEANING.equalsVal(status) && !ShopTableStatusEnum.SUBSCRIBE.equalsVal(status);
return !ShopTableStatusEnum.UNBOUND.equalsVal(status)
&& !ShopTableStatusEnum.SETTLED.equalsVal(status)
&& !ShopTableStatusEnum.SUBSCRIBE.equalsVal(status)
&& !ShopTableStatusEnum.CLOSED.equalsVal(status);
}
}

1
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java
View File

@@ -34,6 +34,7 @@ public interface ShopTableService extends IService<ShopTable> {
Boolean updateInfo(long shopId, ShopTableDTO shopTableDTO);
Boolean clear(long shopId, ShopTableClearDTO shopTableClearDTO);
Boolean expiredTable(long tableId);
Page<ShopTableVO> pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name, Boolean isBind);
}

3
cash-common/cash-common-service/src/main/java/com/czg/system/enums/SysParamCodeEnum.java
View File

@@ -18,6 +18,9 @@ public enum SysParamCodeEnum {
ALI_OSS_ENDPOINT("ali_oss_endpoint", "阿里云endpoint"),
ALI_OSS_ROLE_ARN("ali_oss_role_arn", "阿里云roleArn"),
WX_MINI_VIP_URL("wx_mini_vip_url", "小程序会员页面地址"),
TABLE_CODE_URL("table_code_url", "桌码生成路径"),
;
private final String code;