From 339f42ab06802da7921e6393860ecb25bb072b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 5 Sep 2025 13:39:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MessageTemplateMapper.xml | 2 ++ .../src/main/java/com/cool/store/dto/notice/NoticeDTO.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml index da19e7a78..75df2796f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml @@ -77,6 +77,8 @@ create_user_id as createUserId, create_time as createTime, handle_person_info as handlePersonInfo, + jump_type as jumpType, + jump_url as jumpUrl, store_info as storeInfo FROM zxjp_message_template WHERE deleted = 0 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java index 6cfd8a3c6..686a6d490 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java @@ -79,4 +79,8 @@ public class NoticeDTO { private String storeInfo; + private Integer jump_type; + + private String jump_url; + } From 36ed7cdb8f0e988367dff20102559f8887508f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 5 Sep 2025 14:53:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/notice/NoticeDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java index 686a6d490..acfc00cbb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java @@ -79,8 +79,8 @@ public class NoticeDTO { private String storeInfo; - private Integer jump_type; + private Integer jumpType; - private String jump_url; + private String jumpUrl; } From 5c85b79c8e4c62a04e47e0885f391e80ec43494d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 8 Sep 2025 10:44:40 +0800 Subject: [PATCH 3/3] feat:user->person --- .../com/cool/store/service/impl/MessageTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java index 983812b92..4f5b1021f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java @@ -247,7 +247,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { //组装人员信息 List userList = new ArrayList<>(); userInfoByUserMobileList.forEach(x -> { - CommonDTO user = new CommonDTO("user", x.getUserId(), x.getName()); + CommonDTO user = new CommonDTO("person", x.getUserId(), x.getName()); userList.add(user); }); userInfo = JSONObject.toJSONString(userList);