From 297734ace4c05848b28a792fa89f38bee67be3c1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 09:41:34 +0800
Subject: [PATCH] 合并
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
index a2b0f65..013feaa 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -233,12 +233,11 @@
;
IPage<Notice> noticeIPage = noticeMapper.selectPage(page, queryWrapper);
List<NoticeCardDTO> noticeCardDTOs = new ArrayList<>();
- if (CollectionUtils.isEmpty(noticeIPage.getRecords())){
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticeIPage.getRecords())){
noticeCardDTOs = noticeIPage.getRecords().stream().map(s -> {
NoticeCardDTO noticeCardDTO = new NoticeCardDTO();
BeanUtils.copyProperties(s, noticeCardDTO);
return noticeCardDTO;
-
}).collect(Collectors.toList());
}
PageData<NoticeCardDTO> pageData = new PageData<>();
@@ -279,19 +278,13 @@
* @param memberId 鐢ㄦ埛涓婚敭/鍟嗘埛涓婚敭
* @param integral 鍙樺姩绉垎/鐜伴噾鍊�
* @param objId 鍏宠仈瀵硅薄涓婚敭 - 绉垎娴佹按鍙樺姩璁板綍涓婚敭
- * @param param1 param2
*/
@Override
public void saveMemberIntegralNotice(Constants.IntegralObjType integralObjType,Integer type,
Integer memberId,
BigDecimal integral,
- Integer objId,String param1){
+ Integer objId,String info){
String title = integralObjType.getName();
- String info = integralObjType.getNoteinfo();
- info = info.replace("${param}",integral.toString());
- if(StringUtils.isNotBlank(param1)){
- info = info .replace("${param1}",param1);
- }
this.saveNoticeInfo(
type,
Constants.ONE,
--
Gitblit v1.9.3