From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 b188c07..6216bb3 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
@@ -224,10 +224,8 @@
Notice notice = pageWrap.getModel();
- queryWrapper.ne(Objects.nonNull(notice.getQueryType())&&Constants.equalsInteger(notice.getQueryType(),Constants.ZERO),
- Notice::getObjType,Constants.TWO)
- .eq(Objects.nonNull(notice.getQueryType())&&Constants.equalsInteger(notice.getQueryType(),Constants.ONE),
- Notice::getObjType,Constants.TWO)
+ queryWrapper.ne(Objects.nonNull(notice.getQueryType()),
+ Notice::getType,notice.getQueryType())
.eq(Notice::getMemberId,notice.getMemberId())
.orderByAsc(Notice::getStatus)
.orderByDesc(Notice::getId)
@@ -252,11 +250,10 @@
/**
*
- * @param type 0娑堣垂鑰咃紱1=缁忛攢鍟嗭紱
- * @param objType 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒�
+ * @param type 娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅
+ * @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();
@@ -286,6 +283,7 @@
BigDecimal integral,
Integer objId,String info){
String title = integralObjType.getName();
+
this.saveNoticeInfo(
type,
Constants.ONE,
@@ -311,14 +309,14 @@
MemberCoupon mc = c.getMemberCoupon();
String info = Constants.equalsInteger(mc.getCouponType(),Constants.ZERO)?
"婊�"+mc.getLimitPrice()+"鍏冨噺"+mc.getPrice()+"鍏冩姷鎵ｅ埜*"+c.getNum():
- "婊�"+mc.getLimitPrice()+"鍏冧韩"+mc.getPrice()+"鎶樺埜";
+ "婊�"+mc.getLimitPrice()+"鍏冧韩"+mc.getPrice()+"鎶樺埜*"+c.getNum();
replaceInfo = replaceInfo + (StringUtils.isBlank(replaceInfo)?
info:","+info);
}
noticeInfo.replace("${param}",replaceInfo);
this.saveNoticeInfo(
- Constants.ZERO,
+ Constants.ONE,
Constants.ONE,
memberId,
"鑾峰緱绯荤粺鍙戞斁鐨勪紭鎯犲埜",
@@ -365,8 +363,8 @@
String noticeInfo = "${param}鍥炲浜嗘偍鐨勮瘎璁�";
noticeInfo.replace("${param}",memberName);
this.saveNoticeInfo(
- Constants.ZERO,
- Constants.TWO,
+ Constants.ONE,
+ Constants.THREE,
memberId,
noticeInfo,
noticeInfo,
--
Gitblit v1.9.3