From 4aa039d20f5db0bf760619d88b05cb7c11edad03 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 14:38:27 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index ddccf93..55eb17d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -95,16 +95,16 @@
                 }
                 Constants.WxUrlParams wxUrlParams =  Constants.WxUrlParams.VISIT_REPORT_RECORD_USER;
                 if(!Constants.equalsInteger(visits.getType(),Constants.TWO)){
-                    if(objCode.equals(WxPlatConstants.visitContent.visitUpload)){
+                    if(!objCode.equals(WxPlatConstants.visitContent.visitWaitAudit)){
                         wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_VISIT;
                     }else{
                         wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_USER;
                     }
                 }
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         wxUrlParams
                         ,visits.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
@@ -166,9 +166,9 @@
                 if(Objects.isNull(wxNoticeConfig)){
                     return;
                 }
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.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
@@ -233,9 +233,9 @@
                 if(Objects.isNull(wxNoticeConfig)){
                     return;
                 }
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.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
@@ -304,9 +304,8 @@
                 if(Objects.isNull(wxNoticeConfig)){
                     return;
                 }
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.CAR_USE,carUseBook.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
@@ -392,9 +391,8 @@
                 if(!objCode.equals(WxPlatConstants.platformBookContent.platformBookUpload)){
                     wxUrlParams = Constants.WxUrlParams.PLATFORM_BOOK;
                 }
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         wxUrlParams,platformBooks.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
@@ -411,7 +409,7 @@
                     }else if(Constants.equalsInteger(platformBooks.getStatus(),Constants.TWO)){
                         const9.put("value","鐢宠宸插鏍搁�氳繃");
                     }else{
-                        const9.put("value","鐢宠鏈�氳繃");
+                        const9.put("value","鐢宠宸插鏍搁┏鍥�");
                     }
                 }
                 //杞︾墝鍙�
@@ -473,9 +471,8 @@
                     return;
                 }
 
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.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
@@ -536,9 +533,8 @@
                     return;
                 }
 
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.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
@@ -597,9 +593,8 @@
                     return;
                 }
 
-                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                         Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.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
@@ -610,17 +605,17 @@
                 Map<String, Object> const6 = new HashMap<String,Object>();
                 const6.put("value",wxNoticeConfig.getTitile());
                 //杞︾墝鍙�
-                Map<String, Object> character_string1 = new HashMap<String,Object>();
-                character_string1.put("value",platformJob.getCarCodeFront());
+                Map<String, Object> car_number3 = new HashMap<String,Object>();
+                car_number3.put("value",platformJob.getCarCodeFront());
                 //鏈堝彴鍙�
-                Map<String, Object> thing3 = new HashMap<String,Object>();
-                thing3.put("value", platformJob.getPlatformName());
+                Map<String, Object> thing9 = new HashMap<String,Object>();
+                thing9.put("value", platformJob.getPlatformName());
                 //鏃堕棿
                 Map<String, Object> time4 = new HashMap<String,Object>();
                 time4.put("value", DateUtil.getFomartDate(new Date(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
                 dataMap.put("const6",const6);
-                dataMap.put("character_string1",character_string1);
-                dataMap.put("thing3",thing3);
+                dataMap.put("car_number3",car_number3);
+                dataMap.put("thing9",thing9);
                 dataMap.put("time4",time4);
                 for (String openId:openIds) {
                     paramMap.clear();
@@ -629,6 +624,7 @@
                     paramMap.put("touser", openId);
                     paramMap.put("data", dataMap);
                     String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+                    log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭唴瀹癸細{}", JSONObject.toJSONString(paramMap));
                     if(StringUtils.isBlank(response)){
                         log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
                     }else{

--
Gitblit v1.9.3