zianxin/biz-api-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
dzc committed 2026-04-13 17:58:34 +08:00
1 parent 4edabb8da5
commit 53444853de
10 files changed
+113 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardCarSaveOrUpdateDto.java
+4 -1
View File
@@ -3,8 +3,8 @@ package com.bsd.pjcloud.hard.api.dto.app;
import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto;
import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -38,4 +38,7 @@ public class HardCarSaveOrUpdateDto {
@Schema(description = "订单类型渠道id")
private Long orderSourceTypeId;
@Schema(description = "外卖配置")
private HardParentCarEntity.TakeOutSetting takeOutSetting;
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class HardAppCreateOrderDto {
private Integer customPrice;
// 配送价格(分)
private Integer deliveryPrice;
// private Integer deliveryPrice;
// 商户id
private Long merchantId;
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateTakeOutOrderDto.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class HardAppCreateTakeOutOrderDto {
/**
* 配送价格(分)
*/
private Integer deliveryPrice;
// private Integer deliveryPrice;
/**
* 外卖地址
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardCarEntity.java
+1
View File
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.api.entity.order;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import com.bsd.pjcloud.common.core.util.TenantTable;
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardParentCarEntity.java
+79 -52
View File
@@ -2,9 +2,11 @@ package com.bsd.pjcloud.hard.api.entity.order;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import com.bsd.pjcloud.common.core.util.TenantTable;
import java.time.LocalDateTime;
/**
@@ -18,83 +20,108 @@ import java.time.LocalDateTime;
@NoArgsConstructor
@Data
@TenantTable
@TableName("hard_parent_car")
@TableName(value = "hard_parent_car", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@Schema(description = "父订单表")
public class HardParentCarEntity extends Model<HardParentCarEntity> {
/**
* 标号
*/
/**
* 标号
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description="标号")
@Schema(description = "标号")
private Long id;
/**
* 用户id
*/
@Schema(description="用户id")
/**
* 用户id
*/
@Schema(description = "用户id")
private Long userId;
/**
* 商户id
*/
@Schema(description="商户id")
/**
* 商户id
*/
@Schema(description = "商户id")
private Long merchantId;
/**
* 硬件设备类型
*/
@Schema(description="硬件设备类型")
private String hardType;
/**
* 硬件设备类型
*/
@Schema(description = "硬件设备类型")
private String hardType;
/**
* 订单状态
*/
@Schema(description="订单状态")
/**
* 订单状态
*/
@Schema(description = "订单状态")
private String orderStatus;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建人")
/**
* 外卖配置json
*/
@Schema(description = "外卖配置json")
@TableField(typeHandler = JacksonTypeHandler.class)
private TakeOutSetting takeOutSettingJson;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建人")
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建时间")
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建时间")
private LocalDateTime createTime;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改人")
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改人")
private String updateBy;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改时间")
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改时间")
private LocalDateTime updateTime;
/**
* 删除标记
*/
/**
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@Schema(description="删除标记")
@TableField(fill = FieldFill.INSERT)
@Schema(description = "删除标记")
private String delFlag;
/**
* 租户ID
*/
@Schema(description="租户ID")
/**
* 租户ID
*/
@Schema(description = "租户ID")
private Long tenantId;
@Data
public static class TakeOutSetting {
/**
* 起送价格(分)
*/
private Integer minDeliveryAmt;
/**
* 商家配送费(分)
*/
private Integer mchTakeOutAmt;
/**
* 用户配送费(分)
*/
private Integer userTakeOutAmt;
}
}