suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/cc_20250826_notice' into cc_20250903_big_screen

Browse Source
This commit is contained in:
wangff
2025-09-08 10:46:14 +08:00
parent 514af329ac 5c85b79c8e
commit eacc3c6f8d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml
View File

@@ -77,6 +77,8 @@
create_user_id as createUserId, create_user_id as createUserId,
create_time as createTime, create_time as createTime,
handle_person_info as handlePersonInfo, handle_person_info as handlePersonInfo,
jump_type as jumpType,
jump_url as jumpUrl,
store_info as storeInfo store_info as storeInfo
FROM zxjp_message_template FROM zxjp_message_template
WHERE deleted = 0 WHERE deleted = 0

4
coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java
View File

@@ -79,4 +79,8 @@ public class NoticeDTO {
private String storeInfo; private String storeInfo;
private Integer jumpType;
private String jumpUrl;
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
View File

@@ -247,7 +247,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
//组装人员信息 //组装人员信息
List<CommonDTO> userList = new ArrayList<>(); List<CommonDTO> userList = new ArrayList<>();
userInfoByUserMobileList.forEach(x -> { userInfoByUserMobileList.forEach(x -> {
CommonDTO user = new CommonDTO("user", x.getUserId(), x.getName()); CommonDTO user = new CommonDTO("person", x.getUserId(), x.getName());
userList.add(user); userList.add(user);
}); });
userInfo = JSONObject.toJSONString(userList); userInfo = JSONObject.toJSONString(userList);