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/operation/XpCoupon.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCoupon.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCoupon.java
index 5bd80d9..c65608c 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCoupon.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCoupon.java
@@ -1,30 +1,21 @@
package com.xiaopeng.api.model.operation;
-import java.io.IOException;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.math.BigDecimal;
/**
* <p>
@@ -50,7 +41,7 @@
@ApiModelProperty(value = "优惠券")
private String couponName;
- @ApiModelProperty(value = "类型 1=抵扣 2=满减")
+ @ApiModelProperty(value = "类型 1=抵扣 2=满减 3=抹零")
private Integer couponType;
@ApiModelProperty(value = "条件金额")
@@ -59,6 +50,15 @@
@ApiModelProperty(value = "金额")
private BigDecimal amount;
+ @ApiModelProperty(value = "抹零后金额，对应couponType=3")
+ @Min(0)@Max(9999)
+ private BigDecimal amount2;
+
+ @ApiModelProperty(value = "折扣，对应couponType=2")
+ @DecimalMin(value = "0.1", inclusive = true)
+ @DecimalMax(value = "10", inclusive = true)
+ private BigDecimal amount3;
+
@ApiModelProperty(value = "描述")
private String couponDescription;
--
Gitblit v1.7.1