From b4e9620988c6ccc13aeae54dfe6ad4bf38d269a5 Mon Sep 17 00:00:00 2001 From: lhd <839347550@qq.com> Date: Mon, 25 Aug 2025 12:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85Schema=20required=20=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=88=90=20requiredMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/接口设计/1. 购物车的设计.md | 8 +++--- doc/接口设计/2. 订单设计-确认订单.md | 14 +++++----- .../yami/shop/bean/app/dto/BasketItemDto.java | 22 +++++++-------- .../yami/shop/bean/app/dto/IndexImgDto.java | 10 +++---- .../shop/bean/app/dto/MyOrderItemDto.java | 10 +++---- .../yami/shop/bean/app/dto/OrderShopDto.java | 28 +++++++++---------- .../yami/shop/bean/app/dto/ProductDto.java | 22 +++++++-------- .../shop/bean/app/dto/ProductItemDto.java | 2 +- .../yami/shop/bean/app/dto/ShopCartDto.java | 6 ++-- .../bean/app/dto/ShopCartExpiryItemDto.java | 6 ++-- .../bean/app/dto/ShopCartItemDiscountDto.java | 2 +- .../shop/bean/app/dto/ShopCartItemDto.java | 10 +++---- .../shop/bean/app/dto/ShopCartOrderDto.java | 26 ++++++++--------- .../bean/app/dto/ShopCartOrderMergerDto.java | 14 +++++----- .../com/yami/shop/bean/app/dto/SkuDto.java | 10 +++---- .../yami/shop/bean/app/dto/UserAddrDto.java | 22 +++++++-------- .../bean/app/param/ChangeShopCartParam.java | 10 +++---- .../app/param/OrderRefundExpressParam.java | 6 ++-- .../shop/bean/app/param/OrderRefundParam.java | 10 +++---- .../admin/dto/CaptchaAuthenticationDTO.java | 2 +- .../common/dto/AuthenticationDTO.java | 4 +-- .../security/common/dto/RefreshTokenDTO.java | 2 +- 22 files changed, 123 insertions(+), 123 deletions(-) diff --git a/doc/接口设计/1. 购物车的设计.md b/doc/接口设计/1. 购物车的设计.md index b092abf..949be7f 100644 --- a/doc/接口设计/1. 购物车的设计.md +++ b/doc/接口设计/1. 购物车的设计.md @@ -47,13 +47,13 @@ @Data public class ShopCartDto implements Serializable { - @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 shopName; - @Schema(description = "购物车满减活动携带的商品" , required = true) + @Schema(description = "购物车满减活动携带的商品" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartItemDiscounts; } @@ -64,7 +64,7 @@ public class ShopCartDto implements Serializable { ```java public class ShopCartItemDiscountDto implements Serializable { - @Schema(description = "已选满减项" , required = true) + @Schema(description = "已选满减项" ,requiredMode = Schema.RequiredMode.REQUIRED) private ChooseDiscountItemDto chooseDiscountItemDto; @Schema(description = "商品列表" ) diff --git a/doc/接口设计/2. 订单设计-确认订单.md b/doc/接口设计/2. 订单设计-确认订单.md index f6de2ac..d7e397d 100644 --- a/doc/接口设计/2. 订单设计-确认订单.md +++ b/doc/接口设计/2. 订单设计-确认订单.md @@ -167,25 +167,25 @@ public class ConfirmOrderListener { @Data public class ShopCartOrderMergerDto implements Serializable{ - @Schema(description = "实际总值" , required = true) + @Schema(description = "实际总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double actualTotal; - @Schema(description = "商品总值" , required = true) + @Schema(description = "商品总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double total; - @Schema(description = "商品总数" , required = true) + @Schema(description = "商品总数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer totalCount; - @Schema(description = "订单优惠金额(所有店铺优惠金额相加)" , required = true) + @Schema(description = "订单优惠金额(所有店铺优惠金额相加)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double orderReduce; - @Schema(description = "地址Dto" , required = true) + @Schema(description = "地址Dto" ,requiredMode = Schema.RequiredMode.REQUIRED) private UserAddrDto userAddr; - @Schema(description = "每个店铺的购物车信息" , required = true) + @Schema(description = "每个店铺的购物车信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartOrders; - @Schema(description = "整个订单可以使用的优惠券列表" , required = true) + @Schema(description = "整个订单可以使用的优惠券列表" ,requiredMode = Schema.RequiredMode.REQUIRED) private List coupons; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java index 6918816..fe1b62e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java @@ -25,10 +25,10 @@ import java.util.List; @Data public class BasketItemDto implements Serializable { - @Schema(description = "购物车ID" , required = true) + @Schema(description = "购物车ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long basketId; - @Schema(description = "店铺ID" , required = true) + @Schema(description = "店铺ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long shopId; /** @@ -37,32 +37,32 @@ public class BasketItemDto implements Serializable { @JsonIgnore private String shopName; - @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) + @Schema(description = "产品个数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer prodCount; - @Schema(description = "产品名称" , required = true) + @Schema(description = "产品名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String prodName; - @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 oriPrice; - @Schema(description = "产品简介" , required = true) + @Schema(description = "产品简介" ,requiredMode = Schema.RequiredMode.REQUIRED) private String brief; - @Schema(description = "产品sku信息" , required = true) + @Schema(description = "产品sku信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private String skuName; @Schema(description = "参与满减活动列表" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java index 3b70a7a..5653163 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java @@ -28,31 +28,31 @@ public class IndexImgDto { * 图片 */ @JsonSerialize(using = ImgJsonSerializer.class) - @Schema(description = "图片Url" , required = true) + @Schema(description = "图片Url" ,requiredMode = Schema.RequiredMode.REQUIRED) private String imgUrl; /** * 顺序 */ - @Schema(description = "图片顺序" , required = true) + @Schema(description = "图片顺序" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer seq; /** * 上传时间 */ - @Schema(description = "上传时间" , required = true) + @Schema(description = "上传时间" ,requiredMode = Schema.RequiredMode.REQUIRED) private Date uploadTime; /** * 类型 */ - @Schema(description = "类型" , required = true) + @Schema(description = "类型" ,requiredMode = Schema.RequiredMode.REQUIRED) private int type; /** * 关联id */ - @Schema(description = "关联id" , required = true) + @Schema(description = "关联id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long relation; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java index 91ea692..a4a5e8d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java @@ -22,20 +22,20 @@ import lombok.Data; @Data public class MyOrderItemDto { - @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 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) private Double price; - @Schema(description = "skuName" , required = true) + @Schema(description = "skuName" ,requiredMode = Schema.RequiredMode.REQUIRED) private String skuName; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java index 76e0c5a..6b4c54b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java @@ -30,58 +30,58 @@ public class OrderShopDto implements Serializable { /** * 店铺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 shopName; - @Schema(description = "实际总值" , required = true) + @Schema(description = "实际总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double actualTotal; - @Schema(description = "商品总值" , required = true) + @Schema(description = "商品总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double total; - @Schema(description = "商品总数" , required = true) + @Schema(description = "商品总数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer totalNum; - @Schema(description = "地址Dto" , required = true) + @Schema(description = "地址Dto" ,requiredMode = Schema.RequiredMode.REQUIRED) private UserAddrDto userAddrDto; - @Schema(description = "产品信息" , required = true) + @Schema(description = "产品信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private List orderItemDtos; - @Schema(description = "运费" , required = true) + @Schema(description = "运费" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double transfee; - @Schema(description = "优惠总额" , required = true) + @Schema(description = "优惠总额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double reduceAmount; - @Schema(description = "促销活动优惠金额" , required = true) + @Schema(description = "促销活动优惠金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double discountMoney; - @Schema(description = "优惠券优惠金额" , required = true) + @Schema(description = "优惠券优惠金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double couponMoney; /** * 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间" , required = true) + @Schema(description = "订单创建时间" ,requiredMode = Schema.RequiredMode.REQUIRED) private Date createTime; /** * 订单备注信息 */ - @Schema(description = "订单备注信息" , required = true) + @Schema(description = "订单备注信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private String remarks; /** * 订单状态 */ - @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/ProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java index 0d45af3..25aaf63 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java @@ -26,19 +26,19 @@ public class ProductDto { /** * 店铺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 shopName; /** * 商品ID */ - @Schema(description = "商品ID" , required = true) + @Schema(description = "商品ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long prodId; /** @@ -50,7 +50,7 @@ public class ProductDto { /** * 商品价格 */ - @Schema(description = "商品价格" , required = true) + @Schema(description = "商品价格" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double price; /** @@ -62,42 +62,42 @@ public class ProductDto { /** * 商品原价 */ - @Schema(description = "商品原价" , required = true) + @Schema(description = "商品原价" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double oriPrice; /** * 库存量 */ - @Schema(description = "库存量" , required = true) + @Schema(description = "库存量" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer totalStocks; /** * 简要描述,卖点等 */ - @Schema(description = "简要描述,卖点等" , required = true) + @Schema(description = "简要描述,卖点等" ,requiredMode = Schema.RequiredMode.REQUIRED) private String brief; /** * 商品主图 */ @JsonSerialize(using = ImgJsonSerializer.class) - @Schema(description = "商品主图" , required = true) + @Schema(description = "商品主图" ,requiredMode = Schema.RequiredMode.REQUIRED) private String pic; @JsonSerialize(using = ImgJsonSerializer.class) - @Schema(description = "商品图片列表，以逗号分割" , required = true) + @Schema(description = "商品图片列表，以逗号分割" ,requiredMode = Schema.RequiredMode.REQUIRED) private String imgs; /** * 商品分类 */ - @Schema(description = "商品分类id" , required = true) + @Schema(description = "商品分类id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long categoryId; @Schema(description = "sku列表" ) private List skuList; - @Schema(description = "运费信息" , required = true) + @Schema(description = "运费信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private Transport transport; public static interface WithNoContent{} 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 dfd3489..6a56d8e 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 @@ -48,7 +48,7 @@ public class ProductItemDto implements Serializable { @Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long skuId; - @Schema(description = "规格名称" , required = true) + @Schema(description = "规格名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String skuName; @Schema(description = "basketId" ,requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java index d456371..37a5346 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java @@ -22,13 +22,13 @@ import java.util.List; @Data public class ShopCartDto implements Serializable { - @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 shopName; - @Schema(description = "购物车商品" , required = true) + @Schema(description = "购物车商品" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartItemDiscounts; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java index 28820ea..d446679 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java @@ -21,13 +21,13 @@ import java.util.List; @Data @Schema(description = "购物车失效商品对象") public class ShopCartExpiryItemDto { - @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 shopName; - @Schema(description = "商品项" , required = true) + @Schema(description = "商品项" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartItemDtoList; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java index e5d7b4c..fee2dc6 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java @@ -23,7 +23,7 @@ import java.util.List; public class ShopCartItemDiscountDto implements Serializable { - @Schema(description = "已选满减项" , required = true) + @Schema(description = "已选满减项" ,requiredMode = Schema.RequiredMode.REQUIRED) private ChooseDiscountItemDto chooseDiscountItemDto; @Schema(description = "商品列表" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java index b2842df..b5a5905 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java @@ -29,19 +29,19 @@ import java.util.List; public class ShopCartItemDto extends ProductItemDto implements Serializable { private static final long serialVersionUID = -8284981156242930909L; - @Schema(description = "购物车ID" , required = true) + @Schema(description = "购物车ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long basketId; - @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 skuName; - @Schema(description = "店铺名称" , required = true) + @Schema(description = "店铺名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String shopName; - @Schema(description = "商品原价" , required = true) + @Schema(description = "商品原价" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double oriPrice; @Schema(description = "推广员使用的推销卡号" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java index ce4c25a..e509bb9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java @@ -23,42 +23,42 @@ import java.util.List; @Data public class ShopCartOrderDto implements Serializable{ - @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 shopName; - @Schema(description = "实际总值" , required = true) + @Schema(description = "实际总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double actualTotal; - @Schema(description = "商品总值" , required = true) + @Schema(description = "商品总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double total; - @Schema(description = "商品总数" , required = true) + @Schema(description = "商品总数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer totalCount; - @Schema(description = "运费" , required = true) + @Schema(description = "运费" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double transfee; - @Schema(description = "促销活动优惠金额" , required = true) + @Schema(description = "促销活动优惠金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double discountReduce; - @Schema(description = "优惠券优惠金额" , required = true) + @Schema(description = "优惠券优惠金额" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double couponReduce; - @Schema(description = "店铺优惠金额(促销活动 + 优惠券 + 其他)" , required = true) + @Schema(description = "店铺优惠金额(促销活动 + 优惠券 + 其他)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double shopReduce = 0.0; - @Schema(description = "订单备注信息" , required = true) + @Schema(description = "订单备注信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private String remarks; - @Schema(description = "购物车商品" , required = true) + @Schema(description = "购物车商品" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartItemDiscounts; - @Schema(description = "整个店铺可以使用的优惠券列表" , required = true) + @Schema(description = "整个店铺可以使用的优惠券列表" ,requiredMode = Schema.RequiredMode.REQUIRED) private List coupons; - @Schema(description = "订单编号" , required = true) + @Schema(description = "订单编号" ,requiredMode = Schema.RequiredMode.REQUIRED) private String orderNumber; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java index 30b6bc8..2823507 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java @@ -24,24 +24,24 @@ import java.util.List; @Data public class ShopCartOrderMergerDto implements Serializable{ - @Schema(description = "实际总值" , required = true) + @Schema(description = "实际总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double actualTotal; - @Schema(description = "商品总值" , required = true) + @Schema(description = "商品总值" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double total; - @Schema(description = "商品总数" , required = true) + @Schema(description = "商品总数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer totalCount; - @Schema(description = "订单优惠金额(所有店铺优惠金额相加)" , required = true) + @Schema(description = "订单优惠金额(所有店铺优惠金额相加)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double orderReduce; - @Schema(description = "地址Dto" , required = true) + @Schema(description = "地址Dto" ,requiredMode = Schema.RequiredMode.REQUIRED) private UserAddrDto userAddr; - @Schema(description = "每个店铺的购物车信息" , required = true) + @Schema(description = "每个店铺的购物车信息" ,requiredMode = Schema.RequiredMode.REQUIRED) private List shopCartOrders; - @Schema(description = "整个订单可以使用的优惠券列表" , required = true) + @Schema(description = "整个订单可以使用的优惠券列表" ,requiredMode = Schema.RequiredMode.REQUIRED) private List coupons; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java index 51e6c85..cacb1ca 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java @@ -25,23 +25,23 @@ public class SkuDto implements Serializable { private static final long serialVersionUID = 6457261945829470666L; - @Schema(description = "skuId" , required = true) + @Schema(description = "skuId" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long skuId; - @Schema(description = "价格" , required = true) + @Schema(description = "价格" ,requiredMode = Schema.RequiredMode.REQUIRED) private Double price; @Schema(description = "原价" ) private Double oriPrice; - @Schema(description = "库存(-1表示无穷)" , required = true) + @Schema(description = "库存(-1表示无穷)" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer stocks; - @Schema(description = "sku名称" , required = true) + @Schema(description = "sku名称" ,requiredMode = Schema.RequiredMode.REQUIRED) private String skuName; @Schema(description = "图片" ) @JsonSerialize(using = ImgJsonSerializer.class) private String pic; - @Schema(description = "销售属性组合字符串,格式是p1:v1;p2:v2" , required = true) + @Schema(description = "销售属性组合字符串,格式是p1:v1;p2:v2" ,requiredMode = Schema.RequiredMode.REQUIRED) private String properties; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java index 0b3dd22..50d253a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java @@ -19,45 +19,45 @@ import java.io.Serializable; */ @Data public class UserAddrDto implements Serializable { - @Schema(description = "地址id" , required = true) + @Schema(description = "地址id" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long addrId; - @Schema(description = "收货人" , required = true) + @Schema(description = "收货人" ,requiredMode = Schema.RequiredMode.REQUIRED) private String receiver; - @Schema(description = "省" , required = true) + @Schema(description = "省" ,requiredMode = Schema.RequiredMode.REQUIRED) private String province; - @Schema(description = "城市" , required = true) + @Schema(description = "城市" ,requiredMode = Schema.RequiredMode.REQUIRED) private String city; - @Schema(description = "区" , required = true) + @Schema(description = "区" ,requiredMode = Schema.RequiredMode.REQUIRED) private String area; - @Schema(description = "地址" , required = true) + @Schema(description = "地址" ,requiredMode = Schema.RequiredMode.REQUIRED) private String addr; - @Schema(description = "手机" , required = true) + @Schema(description = "手机" ,requiredMode = Schema.RequiredMode.REQUIRED) private String mobile; - @Schema(description = "是否默认地址（1:是 0：否） " , required = true) + @Schema(description = "是否默认地址（1:是 0：否） " ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer commonAddr; /** * 省ID */ - @Schema(description = "省ID" , required = true) + @Schema(description = "省ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long provinceId; /** * 城市ID */ - @Schema(description = "城市ID" , required = true) + @Schema(description = "城市ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long cityId; /** * 区域ID */ - @Schema(description = "区域ID" , required = true) + @Schema(description = "区域ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long areaId; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java index 86ebb6c..89c5588 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java @@ -21,23 +21,23 @@ import lombok.Data; @Data public class ChangeShopCartParam { - @Schema(description = "购物车ID" , required = true) + @Schema(description = "购物车ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long basketId; @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 = "店铺ID不能为空") - @Schema(description = "店铺ID" , required = true) + @Schema(description = "店铺ID" ,requiredMode = Schema.RequiredMode.REQUIRED) private Long shopId; @NotNull(message = "商品个数不能为空") - @Schema(description = "商品个数" , required = true) + @Schema(description = "商品个数" ,requiredMode = Schema.RequiredMode.REQUIRED) private Integer count; @Schema(description = "分销推广人卡号" ) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java index 975e28d..06e0a1d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java @@ -11,15 +11,15 @@ import jakarta.validation.constraints.NotEmpty; @Data public class OrderRefundExpressParam { - @Schema(description = "退款编号名称" , required = true) + @Schema(description = "退款编号名称" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "退款编号不能为空") private String refundSn; - @Schema(description = "物流公司名称" , required = true) + @Schema(description = "物流公司名称" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "物流公司名称不能为空") private String expressName; - @Schema(description = "物流单号" , required = true) + @Schema(description = "物流单号" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "物流单号不能为空") private String expressNo; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java index 2e37e39..e0dc8c1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java @@ -12,24 +12,24 @@ import jakarta.validation.constraints.NotNull; @Data public class OrderRefundParam { - @Schema(description = "订单编号" , required = true) + @Schema(description = "订单编号" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "订单编号不能为空") private String orderNumber; - @Schema(description = "申请类型(1:仅退款 2退款退货)" , required = true) + @Schema(description = "申请类型(1:仅退款 2退款退货)" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "申请类型不能为空") private Integer applyType; - @Schema(description = "订单项id(全部退款是0)" , required = true) + @Schema(description = "订单项id(全部退款是0)" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "订单项id不能为空") private Long orderItemId; - @Schema(description = "凭证图片列表" , required = true) + @Schema(description = "凭证图片列表" ,requiredMode = Schema.RequiredMode.REQUIRED) private String photoFiles; - @Schema(description = "申请原因" , required = true) + @Schema(description = "申请原因" ,requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "订单编号不能为空") private String buyerMsg; diff --git a/yami-shop-security/yami-shop-security-admin/src/main/java/com/yami/shop/security/admin/dto/CaptchaAuthenticationDTO.java b/yami-shop-security/yami-shop-security-admin/src/main/java/com/yami/shop/security/admin/dto/CaptchaAuthenticationDTO.java index 67ff04d..b73a240 100644 --- a/yami-shop-security/yami-shop-security-admin/src/main/java/com/yami/shop/security/admin/dto/CaptchaAuthenticationDTO.java +++ b/yami-shop-security/yami-shop-security-admin/src/main/java/com/yami/shop/security/admin/dto/CaptchaAuthenticationDTO.java @@ -12,6 +12,6 @@ import lombok.Data; @Data public class CaptchaAuthenticationDTO extends AuthenticationDTO { - @Schema(description = "验证码" , required = true) + @Schema(description = "验证码" ,requiredMode = Schema.RequiredMode.REQUIRED) private String captchaVerification; } diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/AuthenticationDTO.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/AuthenticationDTO.java index 5aaf809..9439e20 100644 --- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/AuthenticationDTO.java +++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/AuthenticationDTO.java @@ -27,14 +27,14 @@ public class AuthenticationDTO { * 用户名 */ @NotBlank(message = "userName不能为空") - @Schema(description = "用户名/邮箱/手机号" , required = true) + @Schema(description = "用户名/邮箱/手机号" ,requiredMode = Schema.RequiredMode.REQUIRED) protected String userName; /** * 密码 */ @NotBlank(message = "passWord不能为空") - @Schema(description = "一般用作密码" , required = true) + @Schema(description = "一般用作密码" ,requiredMode = Schema.RequiredMode.REQUIRED) protected String passWord; } diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/RefreshTokenDTO.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/RefreshTokenDTO.java index f794c88..506343a 100644 --- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/RefreshTokenDTO.java +++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/RefreshTokenDTO.java @@ -25,7 +25,7 @@ public class RefreshTokenDTO { * refreshToken */ @NotBlank(message = "refreshToken不能为空") - @Schema(description = "refreshToken" , required = true) + @Schema(description = "refreshToken" ,requiredMode = Schema.RequiredMode.REQUIRED) private String refreshToken; public String getRefreshToken() {