BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5e9e41c045574331477476657f30aed0063271c2

Authored by xingyu
1 parent 1184b46c

fix: required 过期

Inline Side-by-side
Showing 17 changed files with 103 additions and 66 deletions
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java 0 → 100644
  View file @5e9e41c
  1 +package cn.iocoder.yudao.framework.social.config;
  2 +
  3 +import cn.iocoder.yudao.framework.social.core.YudaoAuthRequestFactory;
  4 +import com.xingyuv.http.HttpUtil;
  5 +import com.xingyuv.http.support.hutool.HutoolImpl;
  6 +import com.xingyuv.jushauth.cache.AuthStateCache;
  7 +import com.xingyuv.justauth.autoconfigure.JustAuthProperties;
  8 +import lombok.extern.slf4j.Slf4j;
  9 +import org.springframework.boot.autoconfigure.AutoConfiguration;
  10 +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
  11 +import org.springframework.boot.context.properties.EnableConfigurationProperties;
  12 +import org.springframework.context.annotation.Bean;
  13 +import org.springframework.context.annotation.Primary;
  14 +
  15 +/**
  16 + * 社交自动装配类
  17 + *
  18 + * @author timfruit
  19 + * @date 2021-10-30
  20 + */
  21 +@Slf4j
  22 +@AutoConfiguration
  23 +@EnableConfigurationProperties(JustAuthProperties.class)
  24 +public class YudaoSocialAutoConfiguration {
  25 +
  26 + @Bean
  27 + @Primary
  28 + @ConditionalOnProperty(prefix = "justauth", value = "enabled", havingValue = "true", matchIfMissing = true)
  29 + public YudaoAuthRequestFactory yudaoAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) {
  30 + // 需要修改 HttpUtil 使用的实现，避免类报错
  31 + HttpUtil.setHttp(new HutoolImpl());
  32 + // 创建 YudaoAuthRequestFactory
  33 + return new YudaoAuthRequestFactory(properties, authStateCache);
  34 + }
  35 +
  36 +}
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @5e9e41c
  1 +cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration
0 \ No newline at end of file 2 \ No newline at end of file
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/vo/article/AppArticleRespVO.java
  View file @5e9e41c
@@ -9,41 +9,41 @@ import java.time.LocalDateTime; @@ -9,41 +9,41 @@ import java.time.LocalDateTime;
9 @Data 9 @Data
10 public class AppArticleRespVO { 10 public class AppArticleRespVO {
11 11
12 - @Schema(description = "文章编号", required = true, example = "1") 12 + @Schema(description = "文章编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
13 private Long id; 13 private Long id;
14 14
15 - @Schema(description = "文章标题", required = true, example = "芋道源码 - 促销模块") 15 + @Schema(description = "文章标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码 - 促销模块")
16 private String title; 16 private String title;
17 17
18 - @Schema(description = "文章作者", required = true, example = "芋道源码") 18 + @Schema(description = "文章作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
19 private String author; 19 private String author;
20 20
21 - @Schema(description = "分类编号", required = true, example = "2048") 21 + @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
22 private Long categoryId; 22 private Long categoryId;
23 23
24 - @Schema(description = "图文封面", required = true, example = "https://www.iocoder.cn/1.png") 24 + @Schema(description = "图文封面", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
25 private String picUrl; 25 private String picUrl;
26 26
27 - @Schema(description = "文章简介", required = true, example = "我是简介") 27 + @Schema(description = "文章简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是简介")
28 private String introduction; 28 private String introduction;
29 29
30 - @Schema(description = "文章内容", required = true, example = "我是详细") 30 + @Schema(description = "文章内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是详细")
31 private String description; 31 private String description;
32 32
33 - @Schema(description = "发布时间", required = true) 33 + @Schema(description = "发布时间", requiredMode = Schema.RequiredMode.REQUIRED)
34 private LocalDateTime createTime; 34 private LocalDateTime createTime;
35 35
36 - @Schema(description = "浏览量", required = true, example = "1024") 36 + @Schema(description = "浏览量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
37 private Integer browseCount; 37 private Integer browseCount;
38 38
39 @Schema(description = "关联的商品 SPU 编号", example = "1024") 39 @Schema(description = "关联的商品 SPU 编号", example = "1024")
40 private Long spuId; 40 private Long spuId;
41 41
42 // TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回； 42 // TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回；
43 -// @Schema(description = "是否热卖推荐", required = true, example = "true") 43 +// @Schema(description = "是否热卖推荐", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
44 // private Boolean recommendHot; 44 // private Boolean recommendHot;
45 // 45 //
46 -// @Schema(description = "是否 Banner 推荐", required = true, example = "true") 46 +// @Schema(description = "是否 Banner 推荐", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
47 // private Boolean recommendBanner; 47 // private Boolean recommendBanner;
48 48
49 } 49 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/vo/category/AppArticleCategoryRespVO.java
  View file @5e9e41c
@@ -7,20 +7,20 @@ import lombok.Data; @@ -7,20 +7,20 @@ import lombok.Data;
7 @Data 7 @Data
8 public class AppArticleCategoryRespVO { 8 public class AppArticleCategoryRespVO {
9 9
10 - @Schema(description = "分类编号", required = true, example = "1") 10 + @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
11 private Long id; 11 private Long id;
12 12
13 - @Schema(description = "分类名称", required = true, example = "技术") 13 + @Schema(description = "分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "技术")
14 private String name; 14 private String name;
15 15
16 - @Schema(description = "分类图标", required = true, example = "https://www.iocoder.cn/1.png") 16 + @Schema(description = "分类图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png")
17 private String picUrl; 17 private String picUrl;
18 18
19 // TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回； 19 // TODO 芋艿：下面 2 个字段，后端要存储，前端不用返回；
20 -// @Schema(description = "状态", required = true, example = "1") 20 +// @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
21 // private Integer status; 21 // private Integer status;
22 // 22 //
23 -// @Schema(description = "排序", required = true, example = "1024") 23 +// @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
24 // private Integer sort; 24 // private Integer sort;
25 25
26 } 26 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
  View file @5e9e41c
@@ -9,46 +9,46 @@ import java.time.LocalDateTime; @@ -9,46 +9,46 @@ import java.time.LocalDateTime;
9 @Data 9 @Data
10 public class AppBargainActivityDetailRespVO { 10 public class AppBargainActivityDetailRespVO {
11 11
12 - @Schema(description = "砍价活动编号", required = true, example = "1024") 12 + @Schema(description = "砍价活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 private Long id; 13 private Long id;
14 14
15 - @Schema(description = "砍价活动名称", required = true, example = "618 大砍价") 15 + @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "618 大砍价")
16 private String name; 16 private String name;
17 17
18 - @Schema(description = "活动开始时间", required = true) 18 + @Schema(description = "活动开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
19 private LocalDateTime startTime; 19 private LocalDateTime startTime;
20 20
21 - @Schema(description = "活动结束时间", required = true) 21 + @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
22 private LocalDateTime endTime; 22 private LocalDateTime endTime;
23 23
24 - @Schema(description = "商品 SPU 编号", required = true, example = "2048") 24 + @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
25 private Long spuId; 25 private Long spuId;
26 26
27 - @Schema(description = "商品 SKU 编号", required = true, example = "1024") 27 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
28 private Long skuId; 28 private Long skuId;
29 29
30 - @Schema(description = "商品价格，单位：分", required = true, example = "100") 30 + @Schema(description = "商品价格，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
31 private Integer price; 31 private Integer price;
32 32
33 - @Schema(description = "商品描述", required = true, example = "我要吃西红柿") 33 + @Schema(description = "商品描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "我要吃西红柿")
34 private String description; 34 private String description;
35 35
36 - @Schema(description = "砍价库存", required = true, example = "512") 36 + @Schema(description = "砍价库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
37 private Integer stock; 37 private Integer stock;
38 38
39 - @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取 39 + @Schema(description = "商品图片", requiredMode = Schema.RequiredMode.REQUIRED, example = "4096") // 从 SPU 的 picUrl 读取
40 private String picUrl; 40 private String picUrl;
41 41
42 - @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取 42 + @Schema(description = "商品市场价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "50") // 从 SPU 的 marketPrice 读取
43 private Integer marketPrice; 43 private Integer marketPrice;
44 44
45 - @Schema(description = "商品单位", required = true, example = "个") // 从 SPU 的 unit 读取，然后转换 45 + @Schema(description = "商品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "个") // 从 SPU 的 unit 读取，然后转换
46 private String unitName; 46 private String unitName;
47 47
48 - @Schema(description = "砍价最低金额，单位：分", required = true, example = "100") // 从砍价商品里取最低价 48 + @Schema(description = "砍价最低金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") // 从砍价商品里取最低价
49 private Integer bargainPrice; 49 private Integer bargainPrice;
50 50
51 - @Schema(description = "砍价成功数量", required = true, example = "100") 51 + @Schema(description = "砍价成功数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
52 private Integer successCount; 52 private Integer successCount;
53 53
54 } 54 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
  View file @5e9e41c
@@ -9,34 +9,34 @@ import java.time.LocalDateTime; @@ -9,34 +9,34 @@ import java.time.LocalDateTime;
9 @Data 9 @Data
10 public class AppBargainActivityRespVO { 10 public class AppBargainActivityRespVO {
11 11
12 - @Schema(description = "砍价活动编号", required = true, example = "1024") 12 + @Schema(description = "砍价活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 private Long id; 13 private Long id;
14 14
15 - @Schema(description = "砍价活动名称", required = true, example = "618 大砍价") 15 + @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "618 大砍价")
16 private String name; 16 private String name;
17 17
18 - @Schema(description = "活动开始时间", required = true) 18 + @Schema(description = "活动开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
19 private LocalDateTime startTime; 19 private LocalDateTime startTime;
20 20
21 - @Schema(description = "活动结束时间", required = true) 21 + @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
22 private LocalDateTime endTime; 22 private LocalDateTime endTime;
23 23
24 - @Schema(description = "商品 SPU 编号", required = true, example = "2048") 24 + @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
25 private Long spuId; 25 private Long spuId;
26 26
27 - @Schema(description = "商品 SKU 编号", required = true, example = "1024") 27 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
28 private Long skuId; 28 private Long skuId;
29 29
30 - @Schema(description = "砍价库存", required = true, example = "512") 30 + @Schema(description = "砍价库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
31 private Integer stock; 31 private Integer stock;
32 32
33 - @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取 33 + @Schema(description = "商品图片", requiredMode = Schema.RequiredMode.REQUIRED, example = "4096") // 从 SPU 的 picUrl 读取
34 private String picUrl; 34 private String picUrl;
35 35
36 - @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取 36 + @Schema(description = "商品市场价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "50") // 从 SPU 的 marketPrice 读取
37 private Integer marketPrice; 37 private Integer marketPrice;
38 38
39 - @Schema(description = "砍价最低金额，单位：分", required = true, example = "100") // 从砍价商品里取最低价 39 + @Schema(description = "砍价最低金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") // 从砍价商品里取最低价
40 private Integer bargainPrice; 40 private Integer bargainPrice;
41 41
42 } 42 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/help/AppBargainHelpCreateReqVO.java
  View file @5e9e41c
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
9 @Data 9 @Data
10 public class AppBargainHelpCreateReqVO { 10 public class AppBargainHelpCreateReqVO {
11 11
12 - @Schema(description = "砍价记录编号", required = true, example = "1024") 12 + @Schema(description = "砍价记录编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 @NotNull(message = "砍价记录编号不能为空") 13 @NotNull(message = "砍价记录编号不能为空")
14 private Long recordId; 14 private Long recordId;
15 15
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/help/AppBargainHelpRespVO.java
  View file @5e9e41c
@@ -9,16 +9,16 @@ import java.time.LocalDateTime; @@ -9,16 +9,16 @@ import java.time.LocalDateTime;
9 @Data 9 @Data
10 public class AppBargainHelpRespVO { 10 public class AppBargainHelpRespVO {
11 11
12 - @Schema(description = "助力用户的昵称", required = true, example = "1024") 12 + @Schema(description = "助力用户的昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 private String nickname; 13 private String nickname;
14 14
15 - @Schema(description = "助力用户的头像", required = true, example = "1024") 15 + @Schema(description = "助力用户的头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16 private String avatar; 16 private String avatar;
17 17
18 - @Schema(description = "助力用户的砍价金额", required = true, example = "1024") 18 + @Schema(description = "助力用户的砍价金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
19 private Integer reducePrice; 19 private Integer reducePrice;
20 20
21 - @Schema(description = "创建时间", required = true, example = "1024") 21 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
22 private LocalDateTime createTime; 22 private LocalDateTime createTime;
23 23
24 } 24 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordCreateReqVO.java
  View file @5e9e41c
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
9 @Data 9 @Data
10 public class AppBargainRecordCreateReqVO { 10 public class AppBargainRecordCreateReqVO {
11 11
12 - @Schema(description = "砍价活动编号", required = true, example = "1024") 12 + @Schema(description = "砍价活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 @NotNull(message = "砍价活动编号不能为空") 13 @NotNull(message = "砍价活动编号不能为空")
14 private Long activityId; 14 private Long activityId;
15 15
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordSummaryRespVO.java
  View file @5e9e41c
@@ -9,23 +9,23 @@ import java.util.List; @@ -9,23 +9,23 @@ import java.util.List;
9 @Data 9 @Data
10 public class AppBargainRecordSummaryRespVO { 10 public class AppBargainRecordSummaryRespVO {
11 11
12 - @Schema(description = "砍价用户数量", required = true, example = "1024") 12 + @Schema(description = "砍价用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13 private Integer userCount; 13 private Integer userCount;
14 14
15 - @Schema(description = "成功砍价的记录", required = true) // 只返回最近的 7 个 15 + @Schema(description = "成功砍价的记录", requiredMode = Schema.RequiredMode.REQUIRED) // 只返回最近的 7 个
16 private List<Record> successRecords; 16 private List<Record> successRecords;
17 17
18 @Schema(description = "成功砍价记录") 18 @Schema(description = "成功砍价记录")
19 @Data 19 @Data
20 public static class Record { 20 public static class Record {
21 21
22 - @Schema(description = "用户昵称", required = true, example = "王**") 22 + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王**")
23 private String nickname; 23 private String nickname;
24 24
25 - @Schema(description = "用户头像", required = true, example = "https://www.iocoder.cn/xxx.jpg") 25 + @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xxx.jpg")
26 private String avatar; 26 private String avatar;
27 27
28 - @Schema(description = "活动名称", required = true, example = "天蚕土豆") 28 + @Schema(description = "活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "天蚕土豆")
29 private String activityName; 29 private String activityName;
30 30
31 } 31 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
  View file @5e9e41c
@@ -15,15 +15,15 @@ public class AppCouponMatchReqVO { @@ -15,15 +15,15 @@ public class AppCouponMatchReqVO {
15 @NotNull(message = "商品金额不能为空") 15 @NotNull(message = "商品金额不能为空")
16 private Integer price; 16 private Integer price;
17 17
18 - @Schema(description = "商品 SPU 编号的数组", required = true, example = "[1, 2]") 18 + @Schema(description = "商品 SPU 编号的数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2]")
19 @NotEmpty(message = "商品 SPU 编号不能为空") 19 @NotEmpty(message = "商品 SPU 编号不能为空")
20 private List<Long> spuIds; 20 private List<Long> spuIds;
21 21
22 - @Schema(description = "商品 SKU 编号的数组", required = true, example = "[1, 2]") 22 + @Schema(description = "商品 SKU 编号的数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2]")
23 @NotEmpty(message = "商品 SKU 编号不能为空") 23 @NotEmpty(message = "商品 SKU 编号不能为空")
24 private List<Long> skuIds; 24 private List<Long> skuIds;
25 25
26 - @Schema(description = "分类编号的数组", required = true, example = "[10, 20]") 26 + @Schema(description = "分类编号的数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[10, 20]")
27 @NotEmpty(message = "分类编号不能为空") 27 @NotEmpty(message = "分类编号不能为空")
28 private List<Long> categoryIds; 28 private List<Long> categoryIds;
29 29
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/vo/config/AppDeliveryConfigRespVO.java
  View file @5e9e41c
@@ -8,10 +8,10 @@ import lombok.Data; @@ -8,10 +8,10 @@ import lombok.Data;
8 @Data 8 @Data
9 public class AppDeliveryConfigRespVO { 9 public class AppDeliveryConfigRespVO {
10 10
11 - @Schema(description = "腾讯地图 KEY", required = true, example = "123456") 11 + @Schema(description = "腾讯地图 KEY", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
12 private String tencentLbsKey; 12 private String tencentLbsKey;
13 13
14 - @Schema(description = "是否开启自提", required = true, example = "true") 14 + @Schema(description = "是否开启自提", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
15 private Boolean pickUpEnable; 15 private Boolean pickUpEnable;
16 16
17 } 17 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/vo/express/AppDeliveryExpressRespVO.java
  View file @5e9e41c
@@ -7,10 +7,10 @@ import lombok.Data; @@ -7,10 +7,10 @@ import lombok.Data;
7 @Data 7 @Data
8 public class AppDeliveryExpressRespVO { 8 public class AppDeliveryExpressRespVO {
9 9
10 - @Schema(description = "编号", required = true, example = "1") 10 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
11 private Long id; 11 private Long id;
12 12
13 - @Schema(description = "门店名称", required = true, example = "顺丰") 13 + @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "顺丰")
14 private String name; 14 private String name;
15 15
16 } 16 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
  View file @5e9e41c
@@ -25,12 +25,12 @@ public class AppTradeOrderSettlementReqVO { @@ -25,12 +25,12 @@ public class AppTradeOrderSettlementReqVO {
25 @Schema(description = "优惠劵编号", example = "1024") 25 @Schema(description = "优惠劵编号", example = "1024")
26 private Long couponId; 26 private Long couponId;
27 27
28 - @Schema(description = "是否使用积分", required = true, example = "true") 28 + @Schema(description = "是否使用积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
29 @NotNull(message = "是否使用积分不能为空") 29 @NotNull(message = "是否使用积分不能为空")
30 private Boolean pointStatus; 30 private Boolean pointStatus;
31 31
32 // ========== 配送相关相关字段 ========== 32 // ========== 配送相关相关字段 ==========
33 - @Schema(description = "配送方式", required = true, example = "1") 33 + @Schema(description = "配送方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
34 @InEnum(value = DeliveryTypeEnum.class, message = "配送方式不正确") 34 @InEnum(value = DeliveryTypeEnum.class, message = "配送方式不正确")
35 private Integer deliveryType; 35 private Integer deliveryType;
36 36
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
  View file @5e9e41c
@@ -13,7 +13,7 @@ import java.util.List; @@ -13,7 +13,7 @@ import java.util.List;
13 @Data 13 @Data
14 public class AppTradeOrderSettlementRespVO { 14 public class AppTradeOrderSettlementRespVO {
15 15
16 - @Schema(description = "交易类型", required = true, example = "1") // 对应 TradeOrderTypeEnum 枚举 16 + @Schema(description = "交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") // 对应 TradeOrderTypeEnum 枚举
17 private Integer type = 1; // TODO 芋艿：改成计算 17 private Integer type = 1; // TODO 芋艿：改成计算
18 18
19 @Schema(description = "购物项数组", requiredMode = Schema.RequiredMode.REQUIRED) 19 @Schema(description = "购物项数组", requiredMode = Schema.RequiredMode.REQUIRED)
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderDetailsRespVO.java
  View file @5e9e41c
@@ -13,16 +13,16 @@ import java.time.LocalDateTime; @@ -13,16 +13,16 @@ import java.time.LocalDateTime;
13 @ToString(callSuper = true) 13 @ToString(callSuper = true)
14 public class PayOrderDetailsRespVO extends PayOrderBaseVO { 14 public class PayOrderDetailsRespVO extends PayOrderBaseVO {
15 15
16 - @Schema(description = "支付订单编号", required = true, example = "1024") 16 + @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
17 private Long id; 17 private Long id;
18 18
19 @Schema(description = "应用名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码") 19 @Schema(description = "应用名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
20 private String appName; 20 private String appName;
21 21
22 - @Schema(description = "创建时间", required = true) 22 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
23 private LocalDateTime createTime; 23 private LocalDateTime createTime;
24 24
25 - @Schema(description = "更新时间", required = true) 25 + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
26 private LocalDateTime updateTime; 26 private LocalDateTime updateTime;
27 27
28 /** 28 /**
@@ -34,7 +34,7 @@ public class PayOrderDetailsRespVO extends PayOrderBaseVO { @@ -34,7 +34,7 @@ public class PayOrderDetailsRespVO extends PayOrderBaseVO {
34 @Schema(description = "支付订单扩展") 34 @Schema(description = "支付订单扩展")
35 public static class PayOrderExtension { 35 public static class PayOrderExtension {
36 36
37 - @Schema(description = "支付订单号", required = true, example = "1024") 37 + @Schema(description = "支付订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
38 private String no; 38 private String no;
39 39
40 @Schema(description = "支付异步通知的内容") 40 @Schema(description = "支付异步通知的内容")
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java
  View file @5e9e41c
@@ -55,7 +55,7 @@ public class DictDataDO extends BaseDO { @@ -55,7 +55,7 @@ public class DictDataDO extends BaseDO {
55 /** 55 /**
56 * css 样式 56 * css 样式
57 */ 57 */
58 - @TableField(updateStrategy = FieldStrategy.IGNORED) 58 + @TableField(updateStrategy = FieldStrategy.ALWAYS)
59 private String cssClass; 59 private String cssClass;
60 /** 60 /**
61 * 备注 61 * 备注