diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java index b36b77c48..b60220b59 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java @@ -78,6 +78,8 @@ public class ShopTable implements Serializable { * 关台:closed */ private String status; + @Column(ignore = true) + private String statusMsg; @Column(onInsertValue = "now()") private LocalDateTime createTime; diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopTableStatusEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopTableStatusEnum.java index f1a2e888c..a4a901476 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopTableStatusEnum.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopTableStatusEnum.java @@ -1,35 +1,49 @@ package com.czg.enums; +import cn.hutool.core.util.StrUtil; import lombok.Getter; +import java.util.HashMap; +import java.util.Map; + /** * 台桌状态枚举 + * * @author Administrator */ @Getter public enum ShopTableStatusEnum { // 未绑定 - UNBOUND("unbound","未绑定"), + UNBOUND("unbound", "未绑定"), // 空闲 - IDLE("idle","空闲"), + IDLE("idle", "空闲"), // 点餐中 - ORDERING("ordering","点餐中"), + ORDERING("ordering", "点餐中"), // 未结账 - UNSETTLED("unsettled","未结账"), + UNSETTLED("unsettled", "未结账"), // 支付中 - PAYING("paying","支付中"), + PAYING("paying", "支付中"), // 已结账 (待清台) - SETTLED("settled","已结账 (待清台)"), + SETTLED("settled", "已结账 (待清台)"), // 关台 - CLOSED("closed","关台"), + CLOSED("closed", "关台"), // 预定 - SUBSCRIBE("subscribe","预定"), + SUBSCRIBE("subscribe", "预定"), ; private final String value; private final String msg; - ShopTableStatusEnum(String value,String msg) { + // 静态代码块,在类加载时执行,用于初始化映射关系 + private static final Map VALUE_MSG_MAP = new HashMap<>(); + + static { + for (ShopTableStatusEnum status : ShopTableStatusEnum.values()) { + VALUE_MSG_MAP.put(status.getValue(), status.getMsg()); + } + } + + ShopTableStatusEnum(String value, String msg) { this.value = value; this.msg = msg; } @@ -37,4 +51,12 @@ public enum ShopTableStatusEnum { public boolean equalsVal(String val) { return val.equals(value); } + + + public static String getMsgByValue(String value) { + if (StrUtil.isBlank(value)) { + return ""; + } + return VALUE_MSG_MAP.get(value); + } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java index 88e85cad3..700d8e2d1 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java @@ -305,6 +305,10 @@ public class ShopTableServiceImpl extends ServiceImpl pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name, Boolean isBind) { PageHelper.startPage(PageUtil.buildPageHelp()); - return PageUtil.convert(new PageInfo<>(mapper.pageInfo(shopId, areaId, tableCode, status, name, isBind))); + List shopTableVOS = mapper.pageInfo(shopId, areaId, tableCode, status, name, isBind); + for (ShopTableVO shopTableVO : shopTableVOS) { + shopTableVO.setStatusMsg(ShopTableStatusEnum.getMsgByValue(shopTableVO.getStatus())); + } + return PageUtil.convert(new PageInfo<>(shopTableVOS)); } }