feat:商城支付、时间段选择

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardApptDto.java

@@ -3,6 +3,11 @@ package com.bsd.pjcloud.hard.api.dto;
 import com.bsd.pjcloud.hard.api.entity.HardApptEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HardApptDto extends HardApptEntity {
+
+    private List<String> reserveTimeList;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java

@@ -4,6 +4,7 @@ import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -13,6 +14,8 @@ public class HardCarDto extends HardCarEntity {
 
     private String createTimeStr;
 
+    private String orderApptUseDateStr;
+
     private LocalDate[] createTimeList;
 
     private List<String> orderStatusCodes;
@@ -23,4 +26,6 @@ public class HardCarDto extends HardCarEntity {
 
     private List<Long> mchIds;
 
+    private LocalDateTime[] apptUseDateTimeList;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -42,6 +42,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private LocalDateTime[] refundTimeList;
 
+    private LocalDateTime[] apptUseDateTimeList;
+
     private List<String> orderTypeCodes;
 
     private List<String> orderPayTypeCodes;
@@ -67,6 +69,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private String createTimeStr;
 
+    private String orderApptUseDateStr;
+
     private List<String> saleStatusCodes;
 
     /**

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java

@@ -50,6 +50,9 @@ public class HardAppCreateOrderDto {
     // 预约id
     private Long apptId;
 
+    // 预约时间类型
+    private String apptTimeType;
+
     // 地址
     private HardAppTakeOutAddressDto address;
 

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardApptEntity.java

@@ -7,6 +7,7 @@ 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;
 

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardApptTimeEntity.java

@@ -27,6 +27,12 @@ public class HardApptTimeEntity extends Model<HardApptTimeEntity> {
     @Schema(description = "编号")
     private Long id;
 
+    /**
+     * 商户ID
+     */
+    @Schema(description = "商户ID")
+    private Long mchId;
+
     /**
      * appt_id
      */
@@ -35,6 +41,7 @@ public class HardApptTimeEntity extends Model<HardApptTimeEntity> {
 
     /**
      * 预约时间类型(昨天、今天、明天、自定义)
+     *
      * @see com.bsd.pjcloud.hard.api.constant.HardApptTimeTypeEnum
      */
     @Schema(description = "预约时间类型(昨天、今天、明天、自定义)")

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/address/HardUserMapAddressEntity.java

@@ -105,6 +105,12 @@ public class HardUserMapAddressEntity extends Model<HardUserMapAddressEntity> {
     @Schema(description = "tag")
     private String tag;
 
+    /**
+     * 是否为默认地址
+     */
+    @Schema(description = "是否为默认地址")
+    private String isDefault;
+
     /**
      * 创建人
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -68,7 +69,6 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     @Schema(description = "商户绑定的部门id")
     private Long merchantDeptId;
 
-
     /**
      * 设备id
      */
@@ -129,6 +129,12 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     @Schema(description = "预约时间段id")
     private Long apptId;
 
+    /**
+     * 预约使用时间(天)
+     */
+    @Schema(description = "预约使用时间(天)")
+    private LocalDate apptUseDate;
+
     /**
      * 订单设备类型
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardApptTimeCascadeVo.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.vo;
+
+import com.bsd.pjcloud.hard.api.entity.HardApptEntity;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class HardApptTimeCascadeVo {
+
+    private String apptTimeType;
+
+    private LocalDate apptTimeWeekStr;
+
+    private List<HardApptEntity> apptList;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardApptTimeTypeVo.java

@@ -0,0 +1,12 @@
+package com.bsd.pjcloud.hard.api.vo;
+
+import lombok.Data;
+
+@Data
+public class HardApptTimeTypeVo {
+
+    private Long mchId;
+
+    private Long type;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardApptVo.java

@@ -3,6 +3,11 @@ package com.bsd.pjcloud.hard.api.vo;
 import com.bsd.pjcloud.hard.api.entity.HardApptEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HardApptVo extends HardApptEntity {
+
+    private List<String> reserveTimeList;
+
 }