From 0496ac237c1c2f84d2530883e85cfe80aaeb9634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com> Date: Sat, 14 Sep 2024 19:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/reward/RewardActivityService.java | 2 +- .../order/vo/AppTradeProductSettlementRespVO.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java index ab6b2e79b..ebfce39c3 100755 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java +++ b/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 { /** * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录 * - * @param spuIds spu 编号 + * @param spuIds SPU 编号数组 * @param status 状态 * @param dateTime 当前日期时间 * @return 满减送活动列表 diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeProductSettlementRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeProductSettlementRespVO.java index 67c407924..773b49617 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeProductSettlementRespVO.java +++ b/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; @Builder public class AppTradeProductSettlementRespVO { - @Schema(description = "商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "spu 商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; @Schema(description = "满减活动对象", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Reward reward; - @Schema(description = "sku活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "sku 活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private List skus; /** @@ -28,11 +28,13 @@ public class AppTradeProductSettlementRespVO { @Data @Builder public static class Reward implements Serializable { + @Schema(description = "满减活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long rewardId; + private Long id; @Schema(description = "满减活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String rewardActivity; + } /** @@ -41,19 +43,21 @@ public class AppTradeProductSettlementRespVO { @Data @Builder public static class Sku implements Serializable { + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long skuId; @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer price; - @Schema(description = "营销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") //PromotionTypeEnum - private Integer type; + @Schema(description = "营销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer type; // 对应 PromotionTypeEnum 枚举 @Schema(description = "限时优惠id", requiredMode = Schema.RequiredMode.REQUIRED) private Long discountId; @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime endTime; + } }