From 3a154bdb0a5aaa2c0ac3eac95a6ba747068bd454 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 10:00:37 +0800
Subject: [PATCH] 优化

---
 server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 68808e5..7096e11 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
@@ -156,12 +156,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);
@@ -207,7 +201,10 @@
         paramMap.put("touser", openId);
         paramMap.put("data", dataMap);
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
         SmsEmail smsEmail = new SmsEmail();
         smsEmail.setPhone(openId);
         smsEmail.setRemark("绛夊緟鍙戦��");
@@ -221,10 +218,14 @@
         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(paramMap));
+<<<<<<< HEAD
+        smsEmailMapper.insert(smsEmail);
+=======
 
         smsEmailMapper.insert(smsEmail);
 
 
+>>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
     }
 
 

--
Gitblit v1.9.3