From 0982a97b0c65e11034b9d6b00cc0e4aba39254be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 11:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 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 f7b9193..e96861f 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
@@ -12,10 +12,12 @@
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.NoticeJoinMapper;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Notice;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.NoticeCardDTO;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.request.CouponNoticeRequest;
import com.doumee.service.business.NoticeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -216,7 +218,6 @@
@Override
public PageData<NoticeCardDTO> findNoticeCardDTOPage(PageWrap<Notice> pageWrap) {
-
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
IPage<Notice> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
LambdaQueryWrapper<Notice> queryWrapper = new LambdaQueryWrapper<>();
@@ -242,4 +243,78 @@
pageData.setRecords(noticeCardDTOs);
return pageData;
}
+
+
+ /**
+ *
+ * @param type 0娑堣垂鑰咃紱1=缁忛攢鍟嗙Н鍒嗭紱2=缁忛攢鍟嗙粨绠楅噾棰�
+ * @param objType 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒�
+ *
+ */
+
+ public void saveNoticeInfo(Integer type,Integer objType,Integer memberId
+ ,String title,String content,Integer objId){
+ Notice notice = new Notice();
+ notice.setCreateDate(new Date());
+ notice.setIsdeleted(Constants.ZERO);
+ notice.setTitle(title);
+ notice.setContent(content);
+ notice.setType(type);
+ notice.setObjType(objType);
+ notice.setObjId(objId);
+ notice.setMemberId(memberId);
+ noticeMapper.insert(notice);
+ }
+
+
+ /**
+ * 绉垎鍙樺姩娑堟伅绫诲瀷
+ * @param integralObjType 绉垎鍙樺姩绫诲瀷
+ * @param memberId 鐢ㄦ埛涓婚敭/鍟嗘埛涓婚敭
+ * @param integral 鍙樺姩绉垎/鐜伴噾鍊�
+ * @param objId 鍏宠仈瀵硅薄涓婚敭 - 绉垎娴佹按鍙樺姩璁板綍涓婚敭
+ * @param param1 param2
+ */
+ public void saveMemberIntegralNotice(Constants.IntegralObjType integralObjType,Integer type, Integer memberId, Integer integral, Integer objId,String param1){
+ String title = integralObjType.getName();
+ String info = integralObjType.getNoteinfo();
+ info = info.replace("${param}",integral.toString()).replace("${param1}",param1);
+ this.saveNoticeInfo(
+ type,
+ Constants.ONE,
+ memberId,
+ title,
+ info,
+ objId
+ );
+ }
+
+ public void couponNotice(Integer memberId,List<CouponNoticeRequest> couponList){
+ String info = "鎭枩鎮ㄨ幏寰椼�愪紭鎯犺鍒欍�戙�愪紭鎯犲埜绫诲瀷銆�";
+ //鎭枩鎮ㄨ幏寰� 婊�50鍑�10鎶垫墸鍒�
+ for (CouponNoticeRequest c:couponList) {
+ MemberCoupon mc = c.getMemberCoupon();
+ Constants.equalsInteger(mc.getCouponType(),Constants.ZERO)?
+
+
+
+
+ }
+
+
+// this.saveNoticeInfo(
+// type,
+// Constants.ONE,
+// memberId,
+// "鑾峰緱绯荤粺鍙戞斁鐨勪紭鎯犲埜",
+// info,
+// objId
+// );
+//
+
+
+ }
+
+
+
}
--
Gitblit v1.9.3