From 452d17b1c16bfe8585c16bd82e67450abd97c82f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:57:25 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
index 1b74dfc..7712b05 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
@@ -6,7 +6,6 @@
import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* @ClassName AppMemberCouponPageVo
@@ -19,7 +18,10 @@
public class AppMemberCouponPageVo {
@ApiModelProperty(value = "用户优惠券id")
- private String memberCouponId;
+ private Long memberCouponId;
+
+ @ApiModelProperty(value = "优惠券id")
+ private Long couponId;
@ApiModelProperty(value = "优惠券名称")
private String couponName;
@@ -33,8 +35,11 @@
@ApiModelProperty(value ="优惠券关联商品",hidden = true)
private String relGoodsIds;
- @ApiModelProperty(value = "使用限制")
- private List<String> goodsLimitList;
+ @ApiModelProperty(value = "商户限制")
+ private String shopLimit;
+
+ @ApiModelProperty(value = "商品限制")
+ private String goodsLimit;
@ApiModelProperty(value = "门槛金额")
private BigDecimal moneyThreshold;
@@ -47,17 +52,20 @@
@ApiModelProperty(value = "有效开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy.MM.dd")
private Date validStartTime;
@ApiModelProperty(value = "有效结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy.MM.dd")
private Date deadlineTime;
@ApiModelProperty(value = "使用时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss")
private Date useTime;
@ApiModelProperty(value = "核销店铺")
private String verifyShopName;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
}
--
Gitblit v1.7.1