aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.1' into dev/3.1_release_merge

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/config/MyTaskScheduler.java
#	src/main/java/com/ai/da/common/enums/ProductEnum.java
#	src/main/java/com/ai/da/common/task/PaymentTask.java
#	src/main/java/com/ai/da/common/utils/LocalCacheUtils.java
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/controller/AffiliateController.java
#	src/main/java/com/ai/da/controller/ConvenientInquiryController.java
#	src/main/java/com/ai/da/controller/StripeController.java
#	src/main/java/com/ai/da/mapper/primary/entity/Library.java
#	src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java
#	src/main/java/com/ai/da/model/dto/CreateCouponDTO.java
#	src/main/java/com/ai/da/model/vo/CheckCouponsVO.java
#	src/main/java/com/ai/da/service/AffiliateService.java
#	src/main/java/com/ai/da/service/PaymentInfoService.java
#	src/main/java/com/ai/da/service/StripeService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
#	src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
#	src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
#	src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties
This commit is contained in:
xupei
2025-08-31 17:54:44 +08:00
parent c649907222 3c2b4ffc48
commit 94cf82340a
30 changed files with 2571 additions and 2170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/model/dto/CreateCouponDTO.java
View File

@@ -14,7 +14,9 @@ public class CreateCouponDTO {
@NotNull(message = "Please set the commissionRate.")
private Float commissionRate;
@ApiModelProperty("推广码到期时间 秒级时间戳")
private Long timestamp;
private Long endTime;
@ApiModelProperty("推广码开始时间 秒级时间戳")
private Long startTime;
@ApiModelProperty("推广码最大使用次数")
private Long maxRedemptions;
@ApiModelProperty("合作者/机构名")

4
src/main/java/com/ai/da/model/dto/EmailSendDTO.java
View File

@@ -15,8 +15,8 @@ public class EmailSendDTO {
private String email;
@NotBlank(message = "operationType.cannot.be.empty")
@ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 " +
"CHANGE_MAILBOX 更改邮箱 UPDATE_USERINFO 仅填写国家、职业（不发送邮件）")
@ApiModelProperty("操作类型 LOGIN 登录 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 " +
"CHANGE_MAILBOX 更改邮箱 UPDATE_USERINFO 仅填写国家、职业（不发送邮件） REGISTER 注册")
private String operationType;
@ApiModelProperty("异常ip")

3
src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java
View File

@@ -23,6 +23,9 @@ public class GenerateModifyDTO {
@ApiModelProperty(value = "sketch所属分类", required = true)
private String category;
@ApiModelProperty(value = "originalId的来源 Library || Generate(默认为空)", required = true)
private String originalIdSource;
@NotNull(message = "id cannot be empty")
@ApiModelProperty(value = "原图id", required = true)
private Long originalId;

2
src/main/java/com/ai/da/model/vo/CheckCouponsVO.java
View File

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class CheckCouponsVO {
@ApiModelProperty("expired || invalid || valid")
@ApiModelProperty("expired 过期 || invalid 无效 || valid 有效 || pending 尚未生效")
private String status;
private String message;

2
src/main/java/com/ai/da/model/vo/PaymentInfoVO.java
View File

@@ -13,6 +13,8 @@ public class PaymentInfoVO {
private Long id;
@ApiModelProperty("付款用户名")
private String payer;
@ApiModelProperty("付款者邮箱")
private String email;
@ApiModelProperty("选择的支付平台 PayPal || Stripe || Alipay-HK")
private String platform;
@ApiModelProperty("支付的金额 单位:HKD")