From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/PaymentUserCouponVo.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/CouponInfoVo.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/PaymentUserCouponVo.java
similarity index 79%
rename from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/CouponInfoVo.java
rename to ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/PaymentUserCouponVo.java
index 28a838d..64713fd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/CouponInfoVo.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/PaymentUserCouponVo.java
@@ -1,18 +1,19 @@
-package com.ruoyi.order.vo;
+package com.ruoyi.account.api.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author zhibing.pu
- * @Date 2024/11/25 17:59
+ * @Date 2024/11/29 16:39
*/
@Data
@ApiModel
-public class CouponInfoVo {
+public class PaymentUserCouponVo {
@ApiModelProperty("优惠券id")
private Long id;
@ApiModelProperty("优惠券名称")
@@ -31,6 +32,8 @@
private String periodStartTime;
@ApiModelProperty("有效期结束时间")
private String periodEndTime;
+ @ApiModelProperty("适用商品id集合，为null表示全部适用")
+ private List<Integer> forGoodIds;
@ApiModelProperty("是否可用")
private Boolean available;
}
--
Gitblit v1.7.1