From bb671486066976fa67477ed71d1d424a6ee4e012 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 21:51:33 +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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 22d8fec..d812acc 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
@@ -12,6 +12,7 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -28,8 +29,6 @@
@ApiModel(value="XpActicityStrategy对象", description="活动策略配置")
public class XpActicityStrategy extends BaseModel {
- private static final long serialVersionUID = 1L;
-
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -43,8 +42,9 @@
@ApiModelProperty(value = "发放规则（1=每日循环发放，2=仅发放一次，3=使用后发放）")
private Integer distributionRules;
- @ApiModelProperty(value = "使用后发放规则json")
- private String distributionRulesAfterUse;
+ @ApiModelProperty(value = "发放时间点")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime distributionTime;
@ApiModelProperty(value = "生效规则（1=次日0点失效，2=指定有效天数，3=指定日期失效）")
private Integer effectiveRules;
@@ -59,8 +59,14 @@
@ApiModelProperty(value = "是否叠加使用（0=否，1=是）")
private Integer stackedUsage;
- @ApiModelProperty(value = "使用时段json")
- private String usagePeriod;
+ @ApiModelProperty(value = "叠加使用，不可超出总金额的百分比")
+ private Integer repPercent;
+
+ @ApiModelProperty(value = "优惠券类型")
+ private Integer CouponTypeId;
+
+ @ApiModelProperty(value = "使用时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',2007-05-03 05:00:00']")
+ private List<String> usagePeriod;
@ApiModelProperty(value = "每人限领数量")
private Integer limitNumber;
--
Gitblit v1.7.1