diff --git a/doc/接口设计/2. 订单设计-确认订单.md b/doc/接口设计/2. 订单设计-确认订单.md index 40deec3..f6de2ac 100644 --- a/doc/接口设计/2. 订单设计-确认订单.md +++ b/doc/接口设计/2. 订单设计-确认订单.md @@ -61,7 +61,7 @@ public class OrderParam { ```java public class OrderParam { - @Schema(description = "地址ID,0为默认地址" ,required=true) + @Schema(description = "地址ID,0为默认地址" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "地址不能为空") private Long addrId; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java index 6c75bcc..1880f55 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java @@ -21,16 +21,16 @@ import lombok.Data; @Data public class CategoryDto { - @Schema(description = "分类id" ,required=true) + @Schema(description = "分类id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long categoryId; - @Schema(description = "分类父id" ,required=true) + @Schema(description = "分类父id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long parentId; - @Schema(description = "分类名称" ,required=true) + @Schema(description = "分类名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String categoryName; - @Schema(description = "分类图片" ,required=true) + @Schema(description = "分类图片" ,requiredMode = Schema.RequiredMode.REQUIRED) @JsonSerialize(using = ImgJsonSerializer.class) private String pic; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java index 3760eac..c1b1277 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java @@ -21,16 +21,16 @@ import java.util.List; @Data public class DeliveryDto { - @Schema(description = "物流公司名称" ,required=true) + @Schema(description = "物流公司名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String companyName; - @Schema(description = "物流公司官网" ,required=true) + @Schema(description = "物流公司官网" ,requiredMode = Schema.RequiredMode.REQUIRED) private String companyHomeUrl; - @Schema(description = "物流订单号" ,required=true) + @Schema(description = "物流订单号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String dvyFlowId; - @Schema(description = "查询出的物流信息" ,required=true) + @Schema(description = "查询出的物流信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private List data; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java index 73dff12..c0e4c80 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java @@ -19,15 +19,15 @@ import lombok.Data; @Data public class DeliveryInfoDto { - @Schema(description = "详细信息" ,required=true) + @Schema(description = "详细信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private String context; private String ftime; - @Schema(description = "快递所在区域" ,required=true) + @Schema(description = "快递所在区域" ,requiredMode = Schema.RequiredMode.REQUIRED) private String location; - @Schema(description = "物流更新时间" ,required=true) + @Schema(description = "物流更新时间" ,requiredMode = Schema.RequiredMode.REQUIRED) private String time; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java index 82b40cd..e780bc8 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java @@ -22,16 +22,16 @@ import java.util.List; @Schema(description = "我的订单") public class MyOrderDto { - @Schema(description = "订单项" ,required=true) + @Schema(description = "订单项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List orderItemDtos; - @Schema(description = "订单号" ,required=true) + @Schema(description = "订单号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String orderNumber; - @Schema(description = "总价" ,required=true) + @Schema(description = "总价" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double actualTotal; - @Schema(description = "订单状态" ,required=true) + @Schema(description = "订单状态" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer status; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java index 629ae47..ab10733 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java @@ -19,7 +19,7 @@ import lombok.Data; @Data public class OrderNumbersDto { - @Schema(description = "多个订单号拼接的字符串" ,required=true) + @Schema(description = "多个订单号拼接的字符串" ,requiredMode = Schema.RequiredMode.REQUIRED) private String orderNumbers; public OrderNumbersDto(String orderNumbers) { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java index f4e8f75..dfd3489 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java @@ -26,32 +26,32 @@ import java.util.List; @Data public class ProductItemDto implements Serializable { - @Schema(description = "产品名称" ,required=true) + @Schema(description = "产品名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String prodName; - @Schema(description = "产品个数" ,required=true) + @Schema(description = "产品个数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer prodCount; - @Schema(description = "产品图片路径" ,required=true) + @Schema(description = "产品图片路径" ,requiredMode = Schema.RequiredMode.REQUIRED) @JsonSerialize(using = ImgJsonSerializer.class) private String pic; - @Schema(description = "产品价格" ,required=true) + @Schema(description = "产品价格" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double price; - @Schema(description = "商品总金额" ,required=true) + @Schema(description = "商品总金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double productTotalAmount; - @Schema(description = "产品ID" ,required=true) + @Schema(description = "产品ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long prodId; - @Schema(description = "skuId" ,required=true) + @Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long skuId; @Schema(description = "规格名称" , required = true) private String skuName; - @Schema(description = "basketId" ,required=true) + @Schema(description = "basketId" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long basketId; @Schema(description = "商品实际金额 = 商品总金额 - 分摊的优惠金额" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java index 0d6cc1c..213053f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java @@ -17,9 +17,9 @@ import io.swagger.v3.oas.annotations.media.Schema; public class UserDto { - @Schema(description = "用户状态:0禁用 1正常" ,required=true) + @Schema(description = "用户状态:0禁用 1正常" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer status; - @Schema(description = "token" ,required=true) + @Schema(description = "token" ,requiredMode = Schema.RequiredMode.REQUIRED) private String token; public Integer getStatus() { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java index e0f179c..6dc612f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java @@ -20,46 +20,46 @@ import jakarta.validation.constraints.NotNull; @Schema(description = "地址参数") public class AddrParam { - @Schema(description = "地址ID" ,required=true) + @Schema(description = "地址ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long addrId; @NotNull(message = "收货人不能为空") - @Schema(description = "收货人" ,required=true) + @Schema(description = "收货人" ,requiredMode = Schema.RequiredMode.REQUIRED) private String receiver; @NotNull(message = "地址不能为空") - @Schema(description = "地址" ,required=true) + @Schema(description = "地址" ,requiredMode = Schema.RequiredMode.REQUIRED) private String addr; @Schema(description = "邮编" ,required=false) private String postCode; @NotNull(message = "手机不能为空") - @Schema(description = "手机" ,required=true) + @Schema(description = "手机" ,requiredMode = Schema.RequiredMode.REQUIRED) private String mobile; @NotNull(message = "省ID不能为空") - @Schema(description = "省ID" ,required=true) + @Schema(description = "省ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long provinceId; @NotNull(message = "城市ID不能为空") - @Schema(description = "城市ID" ,required=true) + @Schema(description = "城市ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long cityId; @NotNull(message = "区ID不能为空") - @Schema(description = "区ID" ,required=true) + @Schema(description = "区ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long areaId; @NotNull(message = "省不能为空") - @Schema(description = "省" ,required=true) + @Schema(description = "省" ,requiredMode = Schema.RequiredMode.REQUIRED) private String province; @NotNull(message = "城市不能为空") - @Schema(description = "城市" ,required=true) + @Schema(description = "城市" ,requiredMode = Schema.RequiredMode.REQUIRED) private String city; @NotNull(message = "区不能为空") - @Schema(description = "区" ,required=true) + @Schema(description = "区" ,requiredMode = Schema.RequiredMode.REQUIRED) private String area; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java index 4ede312..d3718d9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java @@ -18,11 +18,11 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "登陆参数") public class LoginParam { - @Schema(description = "小程序登陆时返回的code(使用code登陆必填)" ,required=true) + @Schema(description = "小程序登陆时返回的code(使用code登陆必填)" ,requiredMode = Schema.RequiredMode.REQUIRED) private String code; - @Schema(description = "登陆时的用户名(账号密码登陆必填)" ,required=true) + @Schema(description = "登陆时的用户名(账号密码登陆必填)" ,requiredMode = Schema.RequiredMode.REQUIRED) private String mobile; - @Schema(description = "登陆时的密码(账号密码登陆必填)" ,required=true) + @Schema(description = "登陆时的密码(账号密码登陆必填)" ,requiredMode = Schema.RequiredMode.REQUIRED) private String password; public String getCode() { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java index 78cb24c..8bdf937 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java @@ -24,20 +24,20 @@ import jakarta.validation.constraints.NotNull; public class OrderItemParam { @NotNull(message = "产品ID不能为空") - @Schema(description = "产品ID" ,required=true) + @Schema(description = "产品ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long prodId; @NotNull(message = "skuId不能为空") - @Schema(description = "skuId" ,required=true) + @Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long skuId; @NotNull(message = "产品数量不能为空") @Min(value = 1,message = "产品数量不能为空") - @Schema(description = "产品数量" ,required=true) + @Schema(description = "产品数量" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer prodCount; @NotNull(message = "店铺id不能为空") - @Schema(description = "店铺id" ,required=true) + @Schema(description = "店铺id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long shopId; @Schema(description = "推广员使用的推销卡号" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java index ec88b95..4bf9736 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java @@ -30,7 +30,7 @@ public class OrderParam { @Schema(description = "立即购买时提交的商品项" ) private OrderItemParam orderItem; - @Schema(description = "地址ID,0为默认地址" ,required=true) + @Schema(description = "地址ID,0为默认地址" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "地址不能为空") private Long addrId; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java index 1df48a7..efbd695 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java @@ -18,13 +18,13 @@ import io.swagger.v3.oas.annotations.media.Schema; public class OrderShopParam { /** 店铺ID **/ - @Schema(description = "店铺id" ,required=true) + @Schema(description = "店铺id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long shopId; /** * 订单备注信息 */ - @Schema(description = "订单备注信息" ,required=true) + @Schema(description = "订单备注信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private String remarks; public Long getShopId() { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java index 3b919ad..6bafae9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java @@ -25,14 +25,14 @@ public class PayParam { * 订单号 */ @NotBlank(message="订单号不能为空") - @Schema(description = "订单号" ,required=true) + @Schema(description = "订单号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String orderNumbers; /** * 支付方式 */ @NotNull(message="支付方式不能为空") - @Schema(description = "支付方式 (1:微信支付 2:支付宝)" ,required=true) + @Schema(description = "支付方式 (1:微信支付 2:支付宝)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer payType; public Integer getPayType() { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java index d979108..b30b92d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java @@ -35,11 +35,11 @@ public class ProdCommParam { /** * 评价,0-5分 */ - @Schema(description = "评价,0-5分" ,required=true) + @Schema(description = "评价,0-5分" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "评价不能为空") private Integer score; - @Schema(description = "评论内容" ,required=true) + @Schema(description = "评论内容" ,requiredMode = Schema.RequiredMode.REQUIRED) private String content; @Schema(description = "评论图片, 用逗号分隔" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java index 4d789a1..4a81cee 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java @@ -21,6 +21,6 @@ import java.util.List; @Data @Schema(description = "提交订单参数") public class SubmitOrderParam { - @Schema(description = "每个店铺提交的订单信息" ,required=true) + @Schema(description = "每个店铺提交的订单信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private List orderShopParam; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java index 6327d5b..03ac76a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java @@ -27,16 +27,16 @@ import java.util.List; public class Area implements Serializable { private static final long serialVersionUID = -6013320537436191451L; @TableId - @Schema(description = "地区id" ,required=true) + @Schema(description = "地区id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long areaId; - @Schema(description = "地区名称" ,required=true) + @Schema(description = "地区名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String areaName; - @Schema(description = "地区上级id" ,required=true) + @Schema(description = "地区上级id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long parentId; - @Schema(description = "地区层级" ,required=true) + @Schema(description = "地区层级" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer level; @TableField(exist=false) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java index bcabdeb..d266c75 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java @@ -29,46 +29,46 @@ public class Transfee implements Serializable { * 运费项id */ @TableId - @Schema(description = "运费项id" ,required=true) + @Schema(description = "运费项id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long transfeeId; /** * 运费模板id */ - @Schema(description = "运费模板id" ,required=true) + @Schema(description = "运费模板id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long transportId; /** * 续件数量 */ - @Schema(description = "续件数量" ,required=true) + @Schema(description = "续件数量" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double continuousPiece; /** * 首件数量 */ - @Schema(description = "首件数量" ,required=true) + @Schema(description = "首件数量" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double firstPiece; /** * 续件费用 */ - @Schema(description = "续件费用" ,required=true) + @Schema(description = "续件费用" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double continuousFee; /** * 首件费用 */ - @Schema(description = "首件费用" ,required=true) + @Schema(description = "首件费用" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double firstFee; @TableField(exist=false) - @Schema(description = "指定条件运费城市项" ,required=true) + @Schema(description = "指定条件运费城市项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List cityList; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java index 97a119d..a926e26 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java @@ -29,39 +29,39 @@ public class TransfeeFree implements Serializable { * 指定条件包邮项id */ @TableId - @Schema(description = "指定条件包邮项id" ,required=true) + @Schema(description = "指定条件包邮项id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long transfeeFreeId; /** * 运费模板id */ - @Schema(description = "运费模板id" ,required=true) + @Schema(description = "运费模板id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long transportId; /** * 包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮) */ - @Schema(description = "包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮)" ,required=true) + @Schema(description = "包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer freeType; /** * 需满金额 */ - @Schema(description = "需满金额" ,required=true) + @Schema(description = "需满金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double amount; /** * 包邮x件/重量/体积 */ - @Schema(description = "包邮x件/重量/体积" ,required=true) + @Schema(description = "包邮x件/重量/体积" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double piece; /** * 指定条件包邮城市项 */ @TableField(exist=false) - @Schema(description = "指定条件包邮城市项" ,required=true) + @Schema(description = "指定条件包邮城市项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List freeCityList; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java index ce77f1a..53f78d9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java @@ -33,14 +33,14 @@ public class Transport implements Serializable { * 运费模板id */ @TableId - @Schema(description = "运费模板id" ,required=true) + @Schema(description = "运费模板id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long transportId; /** * 运费模板名称 */ - @Schema(description = "运费模板名称" ,required=true) + @Schema(description = "运费模板名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String transName; /** @@ -48,48 +48,48 @@ public class Transport implements Serializable { */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建时间" ,required=true) + @Schema(description = "创建时间" ,requiredMode = Schema.RequiredMode.REQUIRED) private Date createTime; /** * 店铺id */ - @Schema(description = "店铺id" ,required=true) + @Schema(description = "店铺id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long shopId; /** * 参考 TransportChargeType * 收费方式(0 按件数,1 按重量 2 按体积) */ - @Schema(description = "收费方式(0 按件数,1 按重量 2 按体积)" ,required=true) + @Schema(description = "收费方式(0 按件数,1 按重量 2 按体积)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer chargeType; /** * 是否包邮 0:不包邮 1:包邮 */ - @Schema(description = "是否包邮 0:不包邮 1:包邮" ,required=true) + @Schema(description = "是否包邮 0:不包邮 1:包邮" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer isFreeFee; /** * 是否含有包邮条件 */ - @Schema(description = "是否含有包邮条件" ,required=true) + @Schema(description = "是否含有包邮条件" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer hasFreeCondition; /** * 指定条件包邮项 */ @TableField(exist=false) - @Schema(description = "指定条件包邮项" ,required=true) + @Schema(description = "指定条件包邮项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List transfeeFrees; /** * 运费项 */ @TableField(exist=false) - @Schema(description = "运费项" ,required=true) + @Schema(description = "运费项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List transfees; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java index 11cb958..3bd2217 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java @@ -20,15 +20,15 @@ import jakarta.validation.constraints.NotBlank; public class DeliveryOrderParam { @NotBlank(message="订单号不能为空") - @Schema(description = "订单号" ,required=true) + @Schema(description = "订单号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String orderNumber; @NotBlank(message="快递公司id不能为空") - @Schema(description = "快递公司" ,required=true) + @Schema(description = "快递公司" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long dvyId; @NotBlank(message="物流单号不能为空") - @Schema(description = "物流单号" ,required=true) + @Schema(description = "物流单号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String dvyFlowId; diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java index d3ddf53..0c03ed1 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java @@ -24,11 +24,11 @@ public class UpdatePasswordDto { @NotBlank(message="旧密码不能为空") @Size(max = 50) - @Schema(description = "旧密码" ,required=true) + @Schema(description = "旧密码" ,requiredMode = Schema.RequiredMode.REQUIRED) private String password; @NotBlank(message="新密码不能为空") @Size(max = 50) - @Schema(description = "新密码" ,required=true) + @Schema(description = "新密码" ,requiredMode = Schema.RequiredMode.REQUIRED) private String newPassword; }