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/dto/operation/XpActivityDto.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/XpActivityDto.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/XpActivityDto.java
index e0991bd..15c2049 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/XpActivityDto.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/XpActivityDto.java
@@ -29,8 +29,11 @@
@ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
private Integer activityType;
+ @ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
+ private Integer acticityType;
+
@ApiModelProperty(value = "是否开启活动总限额")
- private boolean enableTotalLimit;
+ private Boolean enableTotalLimit;
@ApiModelProperty(value = "是否开启活动总限额")
private BigDecimal totalLimit;
@@ -67,7 +70,59 @@
@ApiModelProperty(value = "发放用户")
List<XpActicityUser> activityUser;
- @ApiModelProperty(value = "活动通知")
- XpActivityNotice notice;
+
+ @ApiModelProperty("微信通知（0=否，1=是）")
+ private Integer wechatNotification;
+
+ @ApiModelProperty("微信通知到账提醒（0=否，1=是）")
+ private Integer wechatReceivedReminder;
+ @ApiModelProperty("微信通知即将过期提醒（0=否，1=是）")
+ private Integer wechatAboutExpireReminder;
+ @ApiModelProperty("微信通知即将过期天数")
+ private Integer wechatAboutExpireDays;
+ @ApiModelProperty("微信通知活动开始提醒（0=否，1=是）")
+ private Integer wechatActicityStart;
+ @ApiModelProperty("微信通知临近券生效前X分钟通知")
+ private Integer wechatActicityStartMinutes;
+ @ApiModelProperty("短信通知（0=否，1=是）")
+ private Integer smsNotification;
+ @ApiModelProperty("短信通知到账提醒（0=否，1=是）")
+ private Integer smsReceivedReminder;
+ @ApiModelProperty("短信通知即将过期提醒（0=否，1=是）")
+ private Integer smsAboutExpireReminder;
+ @ApiModelProperty("短信通知即将过期天数")
+ private Integer smsAboutExpireDays;
+ @ApiModelProperty("短信通知活动开始提醒（0=否，1=是）")
+ private Integer smsActicityStart;
+ @ApiModelProperty("短信通知临近券生效前X分钟通知")
+ private Integer smsActicityStartMinutes;
+ @ApiModelProperty("短信通知屏蔽开始时间")
+ private String smsStartBlockingTime;
+ @ApiModelProperty("短信通知屏蔽结束时间")
+ private String smsEndBlockingTime;
+ @ApiModelProperty("小程序弹窗通知（0=否，1=是）")
+ private Integer miniProgramNotification;
+ @ApiModelProperty("小程序弹窗标题")
+ private String miniProgramPopupTitle;
+ @ApiModelProperty("小程序弹窗按钮文案")
+ private String miniProgramBtnText;
+ @ApiModelProperty("小程序弹窗券到账提醒（0=否，1=是）")
+ private String miniProgramReceivedReminder;
+ @ApiModelProperty("小程序弹窗即将过期提醒（0=否，1=是）")
+ private String miniProgramAboutExpireReminder;
+ @ApiModelProperty("小程序弹窗临近券生效前X分钟")
+ private Integer miniProgramAboutExpireMinutes;
+ @ApiModelProperty("通知内容")
+ private String expireMinutesNotificationContent;
+ @ApiModelProperty("小程序弹窗临近到期时间前X天")
+ private Integer aboutExpireDays;
+ @ApiModelProperty("通知内容")
+ private String expireDaysNotificationContent;
+ @ApiModelProperty("是否开启浮窗（0=否，1=是）")
+ private Integer enableFloatWindow;
+ @ApiModelProperty("浮窗优先级权重")
+ private Integer floatWindowPriority;
+ @ApiModelProperty("浮窗跳转链接")
+ private String floatWindowJumpUrl;
}
--
Gitblit v1.7.1