From 889d552abbcbe47ad5f3120c8044713d95a7d3b3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 四月 2026 22:11:21 +0800
Subject: [PATCH] [fix] 活动策略定义
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 d812acc..7dd9f1f 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 lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -42,19 +43,27 @@
@ApiModelProperty(value = "发放规则（1=每日循环发放，2=仅发放一次，3=使用后发放）")
private Integer distributionRules;
- @ApiModelProperty(value = "发放时间点")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime distributionTime;
+ @ApiModelProperty(value = "发放规则json,[]=本券使用后循环发放, [1,2,3]=指定优惠券使用后发放（优惠券id数组）")
+ private List<Long> distributionAfterUse;
- @ApiModelProperty(value = "生效规则（1=次日0点失效，2=指定有效天数，3=指定日期失效）")
+ @ApiModelProperty(value = "生效规则（1=次日0点失效，2=领取后指定日期生效）")
private Integer effectiveRules;
+ @ApiModelProperty(value = "领取后指定日期生效")
+ private LocalDate effectiveDays;
+
+ @ApiModelProperty(value = "生效规则（1=次日0点失效，2=指定有效天数，3=指定日期失效）")
+ private Integer expireRules;
+
@ApiModelProperty(value = "有效天数")
- private Integer effectiveDays;
+ private Integer expireDays;
@ApiModelProperty(value = "有效结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate expireDate;
+
+ @ApiModelProperty(value = "优惠券类型")
+ private Integer CouponTypeId;
@ApiModelProperty(value = "是否叠加使用（0=否，1=是）")
private Integer stackedUsage;
@@ -62,10 +71,7 @@
@ApiModelProperty(value = "叠加使用，不可超出总金额的百分比")
private Integer repPercent;
- @ApiModelProperty(value = "优惠券类型")
- private Integer CouponTypeId;
-
- @ApiModelProperty(value = "使用时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',2007-05-03 05:00:00']")
+ @ApiModelProperty(value = "使用时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',05:00:00']")
private List<String> usagePeriod;
@ApiModelProperty(value = "每人限领数量")
--
Gitblit v1.7.1