From 69f31ede73d2bccc1a334d5d5af531bc4d6e0ec3 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sun, 18 May 2025 11:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E7=A0=81=E5=9B=BE=E7=89=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/promoCode/PromoCodeAddRequest.java | 8 ++++++++ .../model/dto/promoCode/PromoCodeQueryRequest.java | 7 +++++++ .../model/dto/promoCode/PromoCodeUpdateRequest.java | 8 ++++++++ .../dto/promoCodeApply/PromoCodeApplyAddRequest.java | 8 ++++++++ .../dto/promoCodeApply/PromoCodeApplyQueryRequest.java | 6 ++++++ .../dto/promoCodeApply/PromoCodeApplyUpdateRequest.java | 8 ++++++++ .../com/greenorange/promotion/model/entity/PromoCode.java | 5 +++++ .../promotion/model/entity/PromoCodeApply.java | 5 +++++ .../vo/projectNotification/ProjectNotificationVO.java | 6 +++--- .../promotion/model/vo/promoCode/PromoCodeVO.java | 6 ++++++ .../model/vo/promoCodeApply/PromoCodeApplyVO.java | 6 ++++++ .../promotion/service/file/impl/FileInfoServiceImpl.java | 2 +- src/main/resources/application.yml | 2 +- 13 files changed, 72 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeAddRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeAddRequest.java index 3622062..ccc1aab 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeAddRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeAddRequest.java @@ -19,6 +19,7 @@ import java.io.Serializable; "promoCodeLink", "projectId", "promoCodeStatus", + "promoCodeImage" }) public class PromoCodeAddRequest implements Serializable { @@ -36,6 +37,13 @@ public class PromoCodeAddRequest implements Serializable { @Schema(description = "推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @NotBlank(message = "推广码图片不能为空") + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 项目ID */ diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeQueryRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeQueryRequest.java index 0e61690..2e362b4 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeQueryRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeQueryRequest.java @@ -35,6 +35,13 @@ public class PromoCodeQueryRequest extends PageRequest implements Serializable { @Schema(description = "推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @NotBlank(message = "推广码图片不能为空") + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 项目ID */ diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeUpdateRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeUpdateRequest.java index f309d2a..a33d6dc 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeUpdateRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCode/PromoCodeUpdateRequest.java @@ -18,6 +18,7 @@ import java.io.Serializable; "promoCodeLink", "projectId", "promoCodeStatus", + "promoCodeImage" }) public class PromoCodeUpdateRequest implements Serializable { @@ -42,6 +43,13 @@ public class PromoCodeUpdateRequest implements Serializable { @Schema(description = "推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @NotBlank(message = "推广码图片不能为空") + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 项目ID */ diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyAddRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyAddRequest.java index 1d1f6f7..c5f52f0 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyAddRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyAddRequest.java @@ -21,6 +21,7 @@ import java.io.Serializable; "projectName", "projectImage", "userId", + "promoCodeImage" }) public class PromoCodeApplyAddRequest implements Serializable { @@ -52,6 +53,13 @@ public class PromoCodeApplyAddRequest implements Serializable { @Schema(description = "绑定的推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @NotBlank(message = "推广码图片不能为空") + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 绑定的项目名称 */ diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyQueryRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyQueryRequest.java index 2f67e61..b210c1b 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyQueryRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyQueryRequest.java @@ -48,6 +48,12 @@ public class PromoCodeApplyQueryRequest extends PageRequest implements Serializa @Schema(description = "绑定的推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 绑定的项目名称 */ diff --git a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyUpdateRequest.java b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyUpdateRequest.java index 8844dd0..94c0a2c 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyUpdateRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/promoCodeApply/PromoCodeApplyUpdateRequest.java @@ -22,6 +22,7 @@ import java.io.Serializable; "projectName", "projectImage", "userId", + "promoCodeImage" }) public class PromoCodeApplyUpdateRequest implements Serializable { @@ -60,6 +61,13 @@ public class PromoCodeApplyUpdateRequest implements Serializable { @Schema(description = "绑定的推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @NotBlank(message = "推广码图片不能为空") + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 绑定的项目名称 */ diff --git a/src/main/java/com/greenorange/promotion/model/entity/PromoCode.java b/src/main/java/com/greenorange/promotion/model/entity/PromoCode.java index c145a70..8f52527 100644 --- a/src/main/java/com/greenorange/promotion/model/entity/PromoCode.java +++ b/src/main/java/com/greenorange/promotion/model/entity/PromoCode.java @@ -31,6 +31,11 @@ public class PromoCode implements Serializable { */ private String promoCodeLink; + /** + * 推广码图片 + */ + private String promoCodeImage; + /** * 项目ID */ diff --git a/src/main/java/com/greenorange/promotion/model/entity/PromoCodeApply.java b/src/main/java/com/greenorange/promotion/model/entity/PromoCodeApply.java index ced9d9e..1af0a5a 100644 --- a/src/main/java/com/greenorange/promotion/model/entity/PromoCodeApply.java +++ b/src/main/java/com/greenorange/promotion/model/entity/PromoCodeApply.java @@ -49,6 +49,11 @@ public class PromoCodeApply implements Serializable { */ private String promoCodeLink; + /** + * 推广码图片 + */ + private String promoCodeImage; + /** * 绑定的项目名称 */ diff --git a/src/main/java/com/greenorange/promotion/model/vo/projectNotification/ProjectNotificationVO.java b/src/main/java/com/greenorange/promotion/model/vo/projectNotification/ProjectNotificationVO.java index 70e84f0..c05bdb0 100644 --- a/src/main/java/com/greenorange/promotion/model/vo/projectNotification/ProjectNotificationVO.java +++ b/src/main/java/com/greenorange/promotion/model/vo/projectNotification/ProjectNotificationVO.java @@ -23,19 +23,19 @@ public class ProjectNotificationVO implements Serializable { /** * 通知标题 */ - @Schema(description = "通知标题", example = "${field.example}") + @Schema(description = "通知标题", example = "美团省钱包-春季活动价格上调通知") private String notificationTitle; /** * 通知内容 */ - @Schema(description = "通知内容", example = "${field.example}") + @Schema(description = "通知内容", example = "美团省钱包-春季活动价格上调通知美团省钱包-春季活动价格上调通知美团省钱包-春季活动价格上调通知") private String notificationContent; /** * 项目ID */ - @Schema(description = "项目ID", example = "${field.example}") + @Schema(description = "项目ID", example = "1") private Long projectId; diff --git a/src/main/java/com/greenorange/promotion/model/vo/promoCode/PromoCodeVO.java b/src/main/java/com/greenorange/promotion/model/vo/promoCode/PromoCodeVO.java index 74e455c..41902a3 100644 --- a/src/main/java/com/greenorange/promotion/model/vo/promoCode/PromoCodeVO.java +++ b/src/main/java/com/greenorange/promotion/model/vo/promoCode/PromoCodeVO.java @@ -32,6 +32,12 @@ public class PromoCodeVO implements Serializable { @Schema(description = "推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 项目ID */ diff --git a/src/main/java/com/greenorange/promotion/model/vo/promoCodeApply/PromoCodeApplyVO.java b/src/main/java/com/greenorange/promotion/model/vo/promoCodeApply/PromoCodeApplyVO.java index 86f550f..ba3b748 100644 --- a/src/main/java/com/greenorange/promotion/model/vo/promoCodeApply/PromoCodeApplyVO.java +++ b/src/main/java/com/greenorange/promotion/model/vo/promoCodeApply/PromoCodeApplyVO.java @@ -44,6 +44,12 @@ public class PromoCodeApplyVO implements Serializable { @Schema(description = "绑定的推广码链接", example = "mp://y04CZgGkCBmIaZd") private String promoCodeLink; + /** + * 推广码图片 + */ + @Schema(description = "推广码图片", example = "http://xxx.png") + private String promoCodeImage; + /** * 绑定的项目名称 */ diff --git a/src/main/java/com/greenorange/promotion/service/file/impl/FileInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/file/impl/FileInfoServiceImpl.java index d57e995..02a43d0 100644 --- a/src/main/java/com/greenorange/promotion/service/file/impl/FileInfoServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/file/impl/FileInfoServiceImpl.java @@ -127,7 +127,7 @@ public class FileInfoServiceImpl extends ServiceImpl * @param response */ @Override - public void downloadFile(String filename, HttpServletResponse response) throws IOException{ + public void downloadFile(String filename, HttpServletResponse response) throws IOException { ThrowUtils.throwIf(!filename.contains("-"), ErrorCode.PARAMS_ERROR); String[] split = filename.split("-"); FileUploadBizEnum fileUploadBizEnum = FileUploadBizEnum.getEnumByValue(split[0]); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fadf7d2..ad9a171 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod + active: dev