From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java | 19 ++++++++++++-------
1 files changed, 12 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..2597bdd 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,7 @@
public class AppMemberCouponPageVo {
@ApiModelProperty(value = "用户优惠券id")
- private String memberCouponId;
+ private Long memberCouponId;
@ApiModelProperty(value = "优惠券名称")
private String couponName;
@@ -33,8 +32,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 +49,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