From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 4c7d3c9..465600b 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
@@ -70,8 +71,12 @@
* @param token
* @param openIds
*/
- public void sendMeetingBookTemplateNotice(Bookings bookings,String tempId, String token, Set<String> openIds){
+ public void sendMeetingBookTemplateNotice(SystemDictDataBiz systemDictDataBiz,Bookings bookings,String tempId, String token, Set<String> openIds){
if(CollectionUtils.isNotEmpty(openIds)){
+ String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ Constants.WxUrlParams.MEETING,bookings.getId().toString());
+ String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
+
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
Map<String, Object> paramMap = new HashMap<String, Object>();
@@ -97,6 +102,7 @@
paramMap.put("data", dataMap);
for (String openId:openIds) {
paramMap.clear();
+ paramMap.put("url", jumpUrl);
paramMap.put("template_id", tempId);
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
@@ -119,8 +125,13 @@
* @param token
* @param openIds
*/
- public void sendMeetingBookCancelTemplateNotice(Bookings bookings,String tempId, String token, Set<String> openIds){
+ public void sendMeetingBookCancelTemplateNotice(SystemDictDataBiz systemDictDataBiz,Bookings bookings, String tempId, String token, Set<String> openIds){
if(CollectionUtils.isNotEmpty(openIds)){
+ String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ Constants.WxUrlParams.MEETING,bookings.getId().toString());
+ String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);
+
+
String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
//鏁翠綋鍙傛暟map
Map<String, Object> paramMap = new HashMap<String, Object>();
@@ -131,7 +142,7 @@
thing1.put("value",bookings.getName());
//浼氳鏃堕棿
Map<String, Object> time6 = new HashMap<String,Object>();
- time6.put("value", DateUtil.getDate(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") );
+ time6.put("value", DateUtil.getFomartDate(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") );
//浼氳鍦扮偣
Map<String, Object> thing2 = new HashMap<String,Object>();
thing2.put("value",bookings.getRoomName());
@@ -143,9 +154,10 @@
dataMap.put("time6",time6);
dataMap.put("thing2",thing2);
dataMap.put("thing4",thing4);
- paramMap.put("data", dataMap);
for (String openId:openIds) {
paramMap.clear();
+ paramMap.put("url", jumpUrl);
+ paramMap.put("data", dataMap);
paramMap.put("template_id", tempId);
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
--
Gitblit v1.9.3