From 6da3cde42c90fa5383cf1b48e632cb1107c80d3e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 07:27:16 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
index c546665..0cc0f22 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
@@ -1,9 +1,12 @@
package com.xiaopeng.api.model.operation;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xiaopeng.api.vo.account.CouponVo;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +17,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -37,13 +41,16 @@
private String acticityName;
@ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
- private Integer activityType;
+ private Integer acticityType;
@ApiModelProperty(value = "是否开启活动总限额")
- private boolean enableTotalLimit;
+ private Integer aggregateLimit;
- @ApiModelProperty(value = "是否开启活动总限额")
- private BigDecimal totalLimit;
+ @ApiModelProperty(value = "总限额")
+ private BigDecimal limitation;
+
+ @ApiModelProperty(value = "封面图片json")
+ private JSONObject coverImage;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -65,10 +72,65 @@
@ApiModelProperty(value = "邀请启用 1=是 0=否")
private Boolean inviteEnable;
- @ApiModelProperty(value = "图片")
- private String img;
+ @ApiModelProperty("微信通知（0=否，1=是）")
+ private Integer wechatNotification;
- @ApiModelProperty(value = "富文本内容")
- private String richText;
+ @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 LocalDateTime smsStartBlockingTime;
+ @ApiModelProperty("短信通知屏蔽结束时间")
+ private LocalDateTime 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;
+ @ApiModelProperty(value = "是否第一次 1=是 0=否")
+ @TableField(exist = false)
+ private Boolean isFirst;
+
+ @ApiModelProperty(value = "优惠券")
+ @TableField(exist = false)
+ private List<CouponVo> coupons;
}
--
Gitblit v1.7.1