Commit 0496ac237c1c2f84d2530883e85cfe80aaeb9634

Authored by 痴货
1 parent c77a6696

【优化】优化代码

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
@@ -75,7 +75,7 @@ public interface RewardActivityService { @@ -75,7 +75,7 @@ public interface RewardActivityService {
75 /** 75 /**
76 * 获取指定 spu 编号最近参加的活动,每个 spuId 只返回一条记录 76 * 获取指定 spu 编号最近参加的活动,每个 spuId 只返回一条记录
77 * 77 *
78 - * @param spuIds spu 编号 78 + * @param spuIds SPU 编号数组
79 * @param status 状态 79 * @param status 状态
80 * @param dateTime 当前日期时间 80 * @param dateTime 当前日期时间
81 * @return 满减送活动列表 81 * @return 满减送活动列表
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeProductSettlementRespVO.java
@@ -13,13 +13,13 @@ import java.util.List; @@ -13,13 +13,13 @@ import java.util.List;
13 @Builder 13 @Builder
14 public class AppTradeProductSettlementRespVO { 14 public class AppTradeProductSettlementRespVO {
15 15
16 - @Schema(description = "商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 16 + @Schema(description = "spu 商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
17 private Long id; 17 private Long id;
18 18
19 @Schema(description = "满减活动对象", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 19 @Schema(description = "满减活动对象", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
20 private Reward reward; 20 private Reward reward;
21 21
22 - @Schema(description = "sku活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 22 + @Schema(description = "sku 活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
23 private List<Sku> skus; 23 private List<Sku> skus;
24 24
25 /** 25 /**
@@ -28,11 +28,13 @@ public class AppTradeProductSettlementRespVO { @@ -28,11 +28,13 @@ public class AppTradeProductSettlementRespVO {
28 @Data 28 @Data
29 @Builder 29 @Builder
30 public static class Reward implements Serializable { 30 public static class Reward implements Serializable {
  31 +
31 @Schema(description = "满减活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 32 @Schema(description = "满减活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
32 - private Long rewardId; 33 + private Long id;
33 34
34 @Schema(description = "满减活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 35 @Schema(description = "满减活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
35 private String rewardActivity; 36 private String rewardActivity;
  37 +
36 } 38 }
37 39
38 /** 40 /**
@@ -41,19 +43,21 @@ public class AppTradeProductSettlementRespVO { @@ -41,19 +43,21 @@ public class AppTradeProductSettlementRespVO {
41 @Data 43 @Data
42 @Builder 44 @Builder
43 public static class Sku implements Serializable { 45 public static class Sku implements Serializable {
  46 +
44 @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 47 @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
45 private Long skuId; 48 private Long skuId;
46 49
47 @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 50 @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
48 private Integer price; 51 private Integer price;
49 52
50 - @Schema(description = "营销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") //PromotionTypeEnum  
51 - private Integer type; 53 + @Schema(description = "营销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  54 + private Integer type; // 对应 PromotionTypeEnum 枚举
52 55
53 @Schema(description = "限时优惠id", requiredMode = Schema.RequiredMode.REQUIRED) 56 @Schema(description = "限时优惠id", requiredMode = Schema.RequiredMode.REQUIRED)
54 private Long discountId; 57 private Long discountId;
55 58
56 @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED) 59 @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
57 private LocalDateTime endTime; 60 private LocalDateTime endTime;
  61 +
58 } 62 }
59 } 63 }