Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax

# Conflicts: # pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
2026-04-13 05:51:44 +08:00
commit 6cdc873a02
@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.dto.hard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class HandCancelActCodeDto {
+
+    @Schema(description = "用户id不能为空")
+    @NotNull(message = "核销活动子id不能为空")
+    private Long actItemId;
+
+    @Schema(description = "用户id")
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+}
@@ -4,7 +4,6 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -56,7 +55,10 @@ public class HardAppCreateOrderDto {
    private Long apptId;

    // 地址
-    private HardAppTakeOutAddress address;
+    private HardAppTakeOutAddressDto address;
+
+    // 预约时间信息
+    private HardAppTakeOutApptDto appt;

    @Schema(description = "IMMEDIATE立即送 | SCHEDULED预约时段")
    private String expectDeliveryType;
@@ -26,7 +26,13 @@ public class HardAppCreateTakeOutOrderDto {
     * 外卖地址
     */
    @NotNull(message = "外卖地址不能为空")
-    private HardAppTakeOutAddress address;
+    private HardAppTakeOutAddressDto address;
+
+    /**
+     * 外卖预约信息
+     */
+    @NotNull(message = "预约时间信息不能为空")
+    private HardAppTakeOutApptDto appt;

    @Schema(description = "IMMEDIATE立即送（默认）| SCHEDULED预约时段")
    private String expectDeliveryType;
@@ -1,11 +1,10 @@
 package com.bsd.pjcloud.hard.api.dto.order.app;

 import cn.hutool.core.util.ObjectUtil;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@Data
-public class HardAppTakeOutAddress {
+public class HardAppTakeOutAddressDto {

    /**
     * 地址id
@@ -0,0 +1,46 @@
+package com.bsd.pjcloud.hard.api.dto.order.app;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+@Data
+public class HardAppTakeOutApptDto {
+
+    /**
+     * IMMEDIATE:立即送;SCHEDULED:预约时段;
+     */
+    @Schema(description = "IMMEDIATE:立即送;SCHEDULED:预约时段;")
+    private String expectDeliveryType;
+
+    /**
+     * 预约送达日历日(仅SCHEDULED使用)
+     */
+    @Schema(description = "预约送达日历日(仅SCHEDULED使用)")
+    private LocalDate expectDeliveryDate;
+
+    /**
+     * 预约时段开始时间
+     */
+    @Schema(description = "预约时段开始时间")
+    @JsonFormat(pattern = "HH:mm:ss")
+    private LocalTime expectDeliveryStart;
+
+    /**
+     * 预约时段结束时间
+     */
+    @Schema(description = "预约时段结束时间")
+    @JsonFormat(pattern = "HH:mm:ss")
+    private LocalTime expectDeliveryEnd;
+
+    /**
+     * 立即送时预计送达时间点可选
+     */
+    @Schema(description = "立即送时预计送达时间点可选")
+    private LocalDateTime expectArriveTime;
+
+}
@@ -0,0 +1,115 @@
+package com.bsd.pjcloud.hard.api.entity.order;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * 外卖送达时间
+ */
+@Data
+@TenantTable
+@TableName("hard_take_out_appt")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "外卖送达时间")
+public class HardTakeOutApptEntity extends Model<HardTakeOutApptEntity> {
+
+
+    /**
+     * 编号
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "编号")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
+    private Long userId;
+
+    /**
+     * 订单id
+     */
+    @Schema(description = "订单id")
+    private Long orderId;
+
+    /**
+     * IMMEDIATE:立即送;SCHEDULED:预约时段;
+     */
+    @Schema(description = "IMMEDIATE:立即送;SCHEDULED:预约时段;")
+    private String expectDeliveryType;
+
+    /**
+     * 预约送达日历日(仅SCHEDULED使用)
+     */
+    @Schema(description = "预约送达日历日(仅SCHEDULED使用)")
+    private LocalDate expectDeliveryDate;
+
+    /**
+     * 预约时段开始时间
+     */
+    @Schema(description = "预约时段开始时间")
+    private LocalTime expectDeliveryStart;
+
+    /**
+     * 预约时段结束时间
+     */
+    @Schema(description = "预约时段结束时间")
+    private LocalTime expectDeliveryEnd;
+
+    /**
+     * 立即送时预计送达时间点可选
+     */
+    @Schema(description = "立即送时预计送达时间点可选")
+    private LocalDateTime expectArriveTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
+    private String delFlag;
+
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
+    private Long tenantId;
+}