From 4c5d99fd2e9c264ebf7cfb532fae430fb6f7f66b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 29 四月 2026 20:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
index 34c0e8c..3553bc3 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.Value;
import lombok.experimental.Accessors;
import java.time.LocalDate;
@@ -44,6 +45,9 @@
@ApiModelProperty(value = "发放规则（1=每日循环发放，2=仅发放一次，3=使用后发放）")
private Integer distributionRules;
+
+ @ApiModelProperty(value = "每日循环发放时间")
+ private String distributionTime;
@ApiModelProperty(value = "发放规则json,[]=本券使用后循环发放, [1,2,3]=指定优惠券使用后发放（优惠券id数组）")
@TableField(typeHandler = JacksonTypeHandler.class)
@@ -87,4 +91,12 @@
@ApiModelProperty(value = "是否自动使用（0=不开启，1=冒泡发单时自动使用）")
private Integer startUsing;
+ @ApiModelProperty(value = "优惠券id数据")
+ @TableField(exist = false)
+ private List<Long> couponIds;
+
+ @ApiModelProperty(value = "优惠券列表数据")
+ @TableField(exist = false)
+ private List<XpCoupon> couponList;
+
}
--
Gitblit v1.7.1