From ffb0ea5cfb8b5118f0e8f684e13385e9388119fd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 十月 2025 13:52:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
index 98d1056..e11ee10 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
@@ -151,12 +151,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
- smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
- .eq(SmsEmail::getObjType,Constants.FIVE.toString())
- .eq(SmsEmail::getStatus,Constants.TWO)
- .eq(SmsEmail::getType,Constants.TWO)
- .eq(SmsEmail::getObjId,bookings.getId())
- );
+
SmsEmail smsEmail = new SmsEmail();
smsEmail.setPhone(openId);
smsEmail.setRemark("绛夊緟鍙戦��");
@@ -168,13 +163,12 @@
smsEmail.setCreateDate(new Date());
smsEmail.setTitle("浼氳鍗冲皢寮�濮嬫彁閱�");
smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getStartTime(),-earlyMin),"yyyy-MM-dd HH:mm:ss"));
- smsEmail.setContent(JSONObject.toJSONString(map));
+ smsEmail.setContent(JSONObject.toJSONString(paramMap));
+ smsEmailMapper.insert(smsEmail);
}
public void createEndWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings, String openId){
- Map<String,Object> map = new HashMap<>();
-
//鏁翠綋鍙傛暟map
Map<String, Object> paramMap = new HashMap<String, Object>();
//娑堟伅涓婚鏄剧ず鐩稿叧map
@@ -202,13 +196,6 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
- smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
- .eq(SmsEmail::getObjType,Constants.FIVE.toString())
- .eq(SmsEmail::getStatus,Constants.TWO)
- .eq(SmsEmail::getType,Constants.TWO)
- .eq(SmsEmail::getObjId,bookings.getId())
- );
-
SmsEmail smsEmail = new SmsEmail();
smsEmail.setPhone(openId);
smsEmail.setRemark("绛夊緟鍙戦��");
@@ -221,7 +208,8 @@
smsEmail.setTitle("浼氳鍗冲皢寮�濮嬫彁閱�");
Integer endMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.OVER_NOTICE_WX).getCode());
smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getEndTime(),-endMin),"yyyy-MM-dd HH:mm:ss"));
- smsEmail.setContent(JSONObject.toJSONString(map));
+ smsEmail.setContent(JSONObject.toJSONString(paramMap));
+ smsEmailMapper.insert(smsEmail);
}
--
Gitblit v1.9.3