From 0cfbaf9a439dc75824c52a6e58b6849064afbc80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 10:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 6dd2bf3..0d47a1b 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
@@ -4,6 +4,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.IdentityInfo;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,33 +28,32 @@
private static String goodsOrderUrl = "pages/settlementDetails/settlementDetails?goodsOrderId=";
+ private static String identityInfoUrl = "pages/mine/mine";
@Autowired
private SystemDictDataBiz systemDictDataBiz;
- public void bookingsCancel(String openid, String goodsOrderId, String accessToken, String bikeCode, Date startTime, Date endTime) throws WxErrorException {
+ public void identityInfoMessage(String openid, IdentityInfo identityInfo) throws WxErrorException {
RestTemplate restTemplate = new RestTemplate();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 -> accessToken锛歿}",accessToken);
+ String accessToken = WxMiniConfig.wxMaService.getAccessToken();
+ log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁よ瘉淇℃伅 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
- String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+WxMiniConfig.wxMaService.getAccessToken();
+ String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
- WxMsgVO wxMsgVo = new WxMsgVO();
+ WxMsgVO wxMsgVO = new WxMsgVO();
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- wxMsgVo.setTouser(openid);
+ wxMsgVO.setTouser(openid);
//璁㈤槄娑堟伅妯℃澘id
-// wxMsgVo.setTemplate_id(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIME_OUT_TEMPID).getCode());
+ wxMsgVO.setTemplate_id("4H9ztG4E9BxJLwMuYSZ6oiM7yb4KX7u7bYhkhYJP0-Y");
Map<String, TemplateData> m = new HashMap<>(4);
- m.put("character_string1", new TemplateData(bikeCode));
- //瑙ｉ攣鏃堕棿
- m.put("date3", new TemplateData(DateUtil.getFomartDate(startTime,"yyyy/MM/dd HH:mm")));
- //涓婇攣鏃堕棿
- m.put("date4", new TemplateData(DateUtil.getFomartDate(endTime,"yyyy/MM/dd HH:mm")));
- //娓╅Θ鎻愰啋
- m.put("thing5", new TemplateData("涓存椂閿佽溅宸茶秴杩囨渶澶ф椂闀匡紝宸茶嚜鍔ㄨ繕杞�"));
- wxMsgVo.setPage(goodsOrderUrl + goodsOrderId);
- wxMsgVo.setData(m);
+ m.put("thing11", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"鐢ㄥ伐璁よ瘉":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"杩愯揣璁よ瘉":"渚涢璁よ瘉"));
+ m.put("phrase4", new TemplateData(Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"璁よ瘉閫氳繃":"璁よ瘉鏈�氳繃"));
+ m.put("date3", new TemplateData(DateUtil.getFomartDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm:ss")));
+ m.put("thing5", new TemplateData(identityInfo.getAuditRemark()));
+ wxMsgVO.setPage(identityInfoUrl);
+ wxMsgVO.setData(m);
ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVo, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 涓存椂閿佽溅瓒呮椂锛歿}", JSONObject.toJSONString(responseEntity));
+ restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(responseEntity));
}
--
Gitblit v1.9.3