From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/XpAppUserCoupon.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/XpAppUserCoupon.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/XpAppUserCoupon.java
index 07f7e92..783b78e 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/XpAppUserCoupon.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/XpAppUserCoupon.java
@@ -9,6 +9,10 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -33,10 +37,21 @@
private Long id;
@ApiModelProperty(value = "满减金额")
+ @Min(0)@Max(9999)
private BigDecimal fullMoney;
- @ApiModelProperty(value = "金额")
+ @ApiModelProperty(value = "满减面额,对应couponType=1")
+ @Min(0)@Max(9999)
private BigDecimal money;
+
+ @ApiModelProperty(value = "抹零后金额，对应couponType=3")
+ @Min(0)@Max(9999)
+ private BigDecimal money3;
+
+ @ApiModelProperty(value = "折扣，对应couponType=2")
+ @DecimalMin(value = "0.1", inclusive = true)
+ @DecimalMax(value = "10", inclusive = true)
+ private BigDecimal money2;
@ApiModelProperty(value = "过期时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -50,7 +65,7 @@
@ApiModelProperty(value = "状态(1=未使用，2=已使用，3=已过期 0=待领取 4=占用中)")
private Integer status;
- @ApiModelProperty(value = "优惠券类型(1=抵扣，2=满减)")
+ @ApiModelProperty(value = "优惠券类型(1=抵扣，2=满减，3=抹零)")
private Integer couponType;
@ApiModelProperty(value = "用户id")
--
Gitblit v1.7.1