Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,57 @@
+
+package com.czg.account.dto;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import com.alibaba.fastjson2.annotation.JSONField;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-02-19
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopTableCodeDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 桌码
+     */
+    private String tableCode;
+
+    /**
+     * 状态 待绑定0 已绑定1
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 绑定时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime bindTime;
+
+}

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

@@ -0,0 +1,34 @@
+
+package com.czg.account.dto.area;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 店铺区域 实体类。
+ *
+ * @author zs
+ * @since 2025-02-18
+ */
+@Data
+public class ShopAreaAddDTO implements Serializable {
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 区域名称
+     */
+    @NotEmpty(message = "店铺名称不为空")
+    private String name;
+
+
+}

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

@@ -1,8 +1,10 @@
 
-package com.czg.account.dto;
+package com.czg.account.dto.area;
 
 import java.io.Serializable;
 import java.io.Serial;
+
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,21 +20,14 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ShopAreaDTO implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
+public class ShopAreaEditDTO implements Serializable {
 
     /**
      * id
      */
+    @NotNull
     private Integer id;
 
-    /**
-     * 店铺Id
-     */
-    private Integer shopId;
-
     /**
      * 排序
      */
@@ -43,8 +38,5 @@ public class ShopAreaDTO implements Serializable {
      */
     private String name;
 
-    private Long createdAt;
-
-    private Long updatedAt;
 
 }

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

@@ -25,4 +25,9 @@ public class ShopInfoByCodeDTO {
      * 台桌信息
      */
     private ShopTable shopTable;
+
+    /**
+     * 是否会员
+     */
+    private boolean isVip;
 }

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

@@ -0,0 +1,23 @@
+package com.czg.account.dto.table;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ShopTableBindDTO {
+    /**
+     * 台桌id
+     */
+    @NotNull(message = "台桌id不为空")
+    private String id;
+    /**
+     * 桌码
+     */
+    @NotEmpty(message = "桌码不为空")
+    private String tableCode;
+}

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

@@ -1,11 +1,13 @@
 package com.czg.account.entity;
 
+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.io.Serial;
+import java.time.LocalDateTime;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -37,7 +39,7 @@ public class ShopTableArea implements Serializable {
     /**
      * 店铺Id
      */
-    private Integer shopId;
+    private Long shopId;
 
     /**
      * 排序
@@ -49,8 +51,10 @@ public class ShopTableArea implements Serializable {
      */
     private String name;
 
-    private Long createdAt;
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createdTime;
 
-    private Long updatedAt;
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updatedTime;
 
 }

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

@@ -0,0 +1,64 @@
+package com.czg.account.entity;
+
+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.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-02-19
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_table_code")
+@Accessors(chain = true)
+public class ShopTableCode implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 桌码
+     */
+    private String tableCode;
+
+    /**
+     * 状态 待绑定0 已绑定1
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 绑定时间
+     */
+    private LocalDateTime bindTime;
+
+}

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

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

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

@@ -0,0 +1,23 @@
+package com.czg.account.service;
+
+import com.czg.account.dto.area.ShopAreaAddDTO;
+import com.czg.account.dto.area.ShopAreaEditDTO;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.service.IService;
+import com.czg.account.entity.ShopTableArea;
+
+/**
+ * 店铺区域 服务层。
+ *
+ * @author zs
+ * @since 2025-02-18
+ */
+public interface ShopTableAreaService extends IService<ShopTableArea> {
+
+    Page<ShopTableArea> pageInfo(Long shopId, String name);
+
+    boolean edit(Long shopId, ShopAreaEditDTO shopAreaEditDTO);
+
+    Boolean add(ShopAreaAddDTO shopAreaAddDTO);
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.account.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.account.entity.ShopTableCode;
+
+/**
+ *  服务层。
+ *
+ * @author zs
+ * @since 2025-02-19
+ */
+public interface ShopTableCodeService extends IService<ShopTableCode> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.czg.account.service;
 
 import com.czg.account.dto.table.ShopTableAddDTO;
+import com.czg.account.dto.table.ShopTableBindDTO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.account.entity.ShopTable;
@@ -19,4 +20,7 @@ public interface ShopTableService extends IService<ShopTable> {
     Boolean add(Long shopId, ShopTableAddDTO shopTableAddDTO);
 
     void createQrCode(Long shopId, Integer num, HttpServletResponse response) throws IOException;
+
+    Boolean bind(Long shopId, ShopTableBindDTO shopTableBindDTO);
+
 }

cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java

@@ -0,0 +1,28 @@
+package com.czg.order.enums;
+
+import lombok.Getter;
+
+/**
+ * @author ww
+ */
+
+@Getter
+public enum PayEnums {
+    
+    MAIN_SCAN("main_scan", "主扫"),
+    BACK_SCAN("back_scan", "被扫"),
+    WECHAT_MINI("wechat_mini", "微信小程序"),
+    ALIPAY_MINI("alipay_mini", "支付宝小程序"),
+    VIP_PAY("vip_pay", "会员支付"),
+    CASH_PAY("cash_pay", "现金支付"),
+    H5_PAY("h5_pay", "h5支付");
+
+
+    private final String value;
+    private final String msg;
+
+    PayEnums(String value, String msg) {
+        this.value = value;
+        this.msg = msg;
+    }
+}

cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java

@@ -3,10 +3,14 @@ package com.czg.order.service;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.order.dto.OrderInfoQueryDTO;
 import com.czg.order.entity.OrderInfo;
+import com.czg.order.enums.PayEnums;
 import com.czg.order.vo.OrderInfoVo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * 订单表 服务层。
  *
@@ -16,6 +20,10 @@ import com.mybatisflex.core.service.IService;
 public interface OrderInfoService extends IService<OrderInfo> {
 
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
+
     void payCallBackOrder(String orderNo, JSONObject resultJson);
+
     void refundCallBackOrder();
+
+    void upOrderInfo(Long orderId, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType);
 }