台桌管理接口

cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopAreaDTO.java

@@ -0,0 +1,50 @@
+
+package com.czg.account.dto;
+
+import java.io.Serializable;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺区域 实体类。
+ *
+ * @author zs
+ * @since 2025-02-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopAreaDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 店铺Id
+     */
+    private Integer shopId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 区域名称
+     */
+    private String name;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserEditDTO.java

@@ -25,4 +25,8 @@ public class ShopUserEditDTO {
      * 生日
      */
     private String birthDay;
+    /**
+     * 手机号
+     */
+    private String phone;
 }

cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableAddDTO.java

@@ -0,0 +1,47 @@
+package com.czg.account.dto.table;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ShopTableAddDTO {
+    /**
+     * 台桌前缀
+     */
+    @NotEmpty(message = "台桌标识不为空")
+    private String sign;
+    /**
+     * 区域id
+     */
+    private Integer areaId;
+    /**
+     * 起始数字
+     */
+    @Min(1)
+    @NotNull
+    private Integer start;
+    /**
+     * 结束数字
+     */
+    @Min(2)
+    @Max(1000)
+    @NotNull
+    private Integer end;
+    /**
+     * 客座数
+     */
+    @NotNull
+    @Min(message = "客位数最小为1", value = 1)
+    private Integer capacity;
+    /**
+     * 是否自动清台
+     */
+    private Integer autoClear = 1;
+}

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

@@ -1,11 +1,13 @@
 
-package com.czg.account.dto;
+package com.czg.account.dto.table;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
+
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -29,12 +31,11 @@ public class ShopTableDTO implements Serializable {
     /**
      * 自增id
      */
+    @NotNull
     private Integer id;
 
     private String name;
 
-    private Integer shopId;
-
     /**
      * 客座数,允许的客座数量
      */
@@ -65,12 +66,6 @@ public class ShopTableDTO implements Serializable {
      */
     private String status;
 
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
     /**
      * 二维码
      */
@@ -81,36 +76,5 @@ public class ShopTableDTO implements Serializable {
      */
     private Integer autoClear;
 
-    /**
-     * 使用时间
-     */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime useTime;
-
-    /**
-     * 结束时间
-     */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime endTime;
-
-    /**
-     * 已点商品数量
-     */
-    private Integer productNum;
-
-    /**
-     * 总金额
-     */
-    private BigDecimal totalAmount;
-
-    /**
-     * 应付金额
-     */
-    private BigDecimal realAmount;
-
-    /**
-     * 用餐人数
-     */
-    private Integer useNum;
 
 }

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopArea.java

@@ -0,0 +1,56 @@
+package com.czg.account.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺区域 实体类。
+ *
+ * @author zs
+ * @since 2025-02-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_area")
+public class ShopArea implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 店铺Id
+     */
+    private Integer shopId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 区域名称
+     */
+    private String name;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopAreaService.java

@@ -0,0 +1,14 @@
+package com.czg.account.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.account.entity.ShopArea;
+
+/**
+ * 店铺区域 服务层。
+ *
+ * @author zs
+ * @since 2025-02-18
+ */
+public interface ShopAreaService extends IService<ShopArea> {
+
+}

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

@@ -1,5 +1,6 @@
 package com.czg.account.service;
 
+import com.czg.account.dto.table.ShopTableAddDTO;
 import com.mybatisflex.core.service.IService;
 import com.czg.account.entity.ShopTable;
 
@@ -11,4 +12,5 @@ import com.czg.account.entity.ShopTable;
  */
 public interface ShopTableService extends IService<ShopTable> {
 
+    Boolean add(Long shopId, ShopTableAddDTO shopTableAddDTO);
 }