From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 85565d8..9a1ed69 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
@@ -120,8 +120,6 @@
}
public void createBeginWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings, String openId){
- Map<String,Object> map = new HashMap<>();
-
//鏁翠綋鍙傛暟map
Map<String, Object> paramMap = new HashMap<String, Object>();
//娑堟伅涓婚鏄剧ず鐩稿叧map
@@ -169,13 +167,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
@@ -203,12 +200,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);
@@ -222,7 +213,11 @@
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