Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,74 @@
+
+package com.czg.account.dto.ad;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import com.alibaba.fastjson2.annotation.JSONField;
+import java.io.Serial;
+
+import com.czg.validator.group.InsertGroup;
+import com.czg.validator.group.UpdateGroup;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺广告 实体类。
+ *
+ * @author zs
+ * @since 2025-02-26
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopAdDTO implements Serializable {
+
+    /**
+     * 自增id
+     */
+    @NotNull(message = "id不为空", groups = {UpdateGroup.class})
+    private Long id;
+
+    /**
+     * 广告图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 跳转页面路径
+     */
+    private String linkPath;
+
+    /**
+     * 广告展示圆角
+     */
+    private Integer borderRadius;
+
+    /**
+     * 弹窗展示位置：home首页，make_order点餐页
+     */
+    @NotBlank(message = "展示位置不为空", groups = InsertGroup.class)
+    private String showPosition;
+
+    /**
+     * 显示频率：only_one 仅首次展示, every_show 每次打开都展示，every_day 每天展示一次，three_day 每三天展示一次， seven_day 每七天展示一次， thirty_day 没30天展示一次
+     */
+    @NotBlank(message = "显示频率不为空", groups = InsertGroup.class)
+    private String frequency;
+
+    /**
+     * 广告状态：0未启用，1已启用
+     */
+    @NotNull(message = "广告状态不为空", groups = InsertGroup.class)
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}

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

@@ -0,0 +1,91 @@
+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;
+
+/**
+ * 店铺广告 实体类。
+ *
+ * @author zs
+ * @since 2025-02-26
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_ad")
+public class ShopAd implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 店铺id，如果是通用广告则为0
+     */
+    private Long shopId;
+
+    /**
+     * 广告图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 跳转页面路径
+     */
+    private String linkPath;
+
+    /**
+     * 广告展示圆角
+     */
+    private Integer borderRadius;
+
+    /**
+     * 弹窗展示位置：home首页，make_order点餐页
+     */
+    private String showPosition;
+
+    /**
+     * 显示频率：only_one 仅首次展示, every_show 每次打开都展示，every_day 每天展示一次，three_day 每三天展示一次， seven_day 每七天展示一次， thirty_day 没30天展示一次
+     */
+    private String frequency;
+
+    /**
+     * 广告状态：0未启用，1已启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.account.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.account.entity.ShopAd;
+
+/**
+ * 店铺广告 服务层。
+ *
+ * @author zs
+ * @since 2025-02-26
+ */
+public interface ShopAdService extends IService<ShopAd> {
+
+}

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

@@ -25,7 +25,7 @@ import java.time.LocalDateTime;
 public interface OrderInfoService extends IService<OrderInfo> {
 
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
-    HistoryOrderVo historyOrder(Long orderId);
+    HistoryOrderVo historyOrder(Long orderId,String tableCode);
     OrderInfo createOrder(OrderInfoAddDTO param);
 
     OrderInfo checkOrderPay(CheckOrderPay param);
@@ -35,4 +35,6 @@ public interface OrderInfoService extends IService<OrderInfo> {
     void refundCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson);
 
     void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType);
+
+    void expired(Long orderId);
 }