From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java b/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java
index 59ece1c..59c76b0 100644
--- a/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java
+++ b/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java
@@ -56,7 +56,7 @@
*/
public void identityInfoMessage(String openid, IdentityInfo identityInfo){
try{
- RestTemplate restTemplate = new RestTemplate();
+
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁よ瘉淇℃伅 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
@@ -66,12 +66,11 @@
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
wxMsgVO.setTouser(openid);
//璁㈤槄娑堟伅妯℃澘id
- wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDndgwNDIA0EvCiE6vqBnExpQ");
+ wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDnX6sOhYBJWwkLExVjBB563U");
Map<String, TemplateData> m = new HashMap<>(4);
- m.put("thing2", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"瀹炲悕璁よ瘉":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"杩愯揣璁よ瘉":"渚涢璁よ瘉"));
+ m.put("thing2", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"鐢ㄥ伐璁よ瘉":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"杩愯揣璁よ瘉":"渚涢璁よ瘉"));
m.put("phrase6", new TemplateData(Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"閫氳繃":"鏈�氳繃"));
m.put("time12", new TemplateData(DateUtil.formatDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm")));
- m.put("thing14", new TemplateData(identityInfo.getAuditRemark()));
wxMsgVO.setPage(mineUrl);
wxMsgVO.setData(m);
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(wxMsgVO));
@@ -94,7 +93,7 @@
* @throws WxErrorException
*/
public void cancelMessage(List<String> openidList, Orders orders,Integer cancelType ){
- RestTemplate restTemplate = new RestTemplate();
+
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙栨秷涓氬姟 -> accessToken锛歿}",accessToken);
@@ -109,7 +108,7 @@
m.put("character_string3", new TemplateData(orders.getCode()));
m.put("thing2", new TemplateData(Constants.orderType.getName(orders.getType())));
m.put("thing1", new TemplateData(orders.getLocation() + (StringUtils.isNotBlank(orders.getLocationRemark())?orders.getLocationRemark():"")));
- m.put("date8", new TemplateData(DateUtil.getFomartDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss")));
+ m.put("date8", new TemplateData(DateUtil.formatDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss")));
m.put("thing6", new TemplateData(Constants.equalsInteger(cancelType,Constants.ZERO)?"骞冲彴鍙栨秷":Constants.equalsInteger(cancelType,Constants.ONE)?"鍙戝崟鏂瑰彇娑�":"鎺ュ崟鏂瑰彇娑�"));
String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
@@ -145,7 +144,7 @@
* @throws WxErrorException
*/
public void acceptMessage(String openid, Orders orders,String memberName,String memberPhone){
- RestTemplate restTemplate = new RestTemplate();
+
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎺ュ崟涓氬姟 -> accessToken锛歿}",accessToken);
@@ -180,7 +179,7 @@
public void orderUpdMessage(String openid, Orders orders){
- RestTemplate restTemplate = new RestTemplate();
+
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙樻洿閫氱煡 -> accessToken锛歿}",accessToken);
@@ -218,7 +217,7 @@
public void withdrawalMessage(String openid, WithdrawalOrders withdrawalOrders){
try{
- RestTemplate restTemplate = new RestTemplate();
+
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎻愮幇鎴愬姛閫氱煡 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
@@ -249,7 +248,7 @@
public void revenueMessage(String openid, Orders orders){
try{
- RestTemplate restTemplate = new RestTemplate();
+
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鏀剁泭閫氱煡 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
@@ -281,7 +280,7 @@
public void autoDispatchMessage(String openid, Orders orders,double distance){
try{
- RestTemplate restTemplate = new RestTemplate();
+
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鏈嶅姟娲惧崟 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
@@ -296,7 +295,7 @@
m.put("thing3", new TemplateData(orders.getOrderContent()));
m.put("phrase4", new TemplateData("姝ゅ湴璺濈鎮�"+distance+"鍏噷"));
m.put("amount28", new TemplateData(orders.getEstimatedAccount().toString()));
- m.put("thing12", new TemplateData("宸ュ崟灏嗕簬"+DateUtil.getFomartDate(orders.getStartDate(),"MM-dd")+"寮�濮�"));
+ m.put("thing12", new TemplateData("宸ュ崟灏嗕簬"+DateUtil.formatDate(orders.getStartDate(),"MM-dd")+"寮�濮�"));
String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
pageUrl = pageUrl.replace("{id}",orders.getId().toString());
@@ -311,8 +310,35 @@
}catch (WxErrorException wxErrorException){
}
-
}
+ public void waitPayMessage(String openid, Orders orders){
+ try{
+ String accessToken = WxMiniConfig.wxMaService.getAccessToken();
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟閲戦纭寰呮敮浠� -> accessToken锛歿}",accessToken);
+ //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
+ String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
+ //鎷兼帴鎺ㄩ�佺殑妯＄増
+ WxMsgVO wxMsgVO = new WxMsgVO();
+ wxMsgVO.setTouser(openid);
+ //璁㈤槄娑堟伅妯℃澘id
+ wxMsgVO.setTemplate_id("3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg");
+ Map<String, TemplateData> m = new HashMap<>(5);
+ m.put("character_string1", new TemplateData(orders.getCode()));
+ m.put("thing7", new TemplateData( Constants.getOrderInfo(orders)));
+ m.put("amount14", new TemplateData(new BigDecimal(orders.getPayAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString()));
+ String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
+ Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
+ pageUrl = pageUrl.replace("{id}",orders.getId().toString());
+ wxMsgVO.setPage(pageUrl);
+ wxMsgVO.setData(m);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟閲戦纭寰呮敮浠橈細{}", JSONObject.toJSONString(wxMsgVO));
+ //鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟閲戦纭寰呮敮浠橈細{}", JSONObject.toJSONString(responseEntity));
+ }catch (WxErrorException wxErrorException){
+
+ }
+ }
}
--
Gitblit v1.9.3