huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 09:11:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1025 【代码优化】SYSTEM：订阅消息跳转小程序类型

Browse Source 
Merge pull request !1025 from puhui999/develop
This commit is contained in:
芋道源码 2024-07-31 05:45:14 +00:00 committed by Gitee
commit e860314b20
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
View File

@ -371,11 +371,10 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
MapUtil.<String, Object>builder().put("expressName", express != null ? express.getName() : "") MapUtil.<String, Object>builder().put("expressName", express != null ? express.getName() : "")
.put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build()); .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build());
// TODO @puhui999：可以改成 4.1 4.2。因为都算通知哈； // 4.1 发送站内信
// 4. 发送站内信
tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO() tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO()
.setOrderId(order.getId()).setUserId(order.getUserId()).setMessage(null)); .setOrderId(order.getId()).setUserId(order.getUserId()).setMessage(null));
// 5. 发送订阅消息 // 4.2 发送订阅消息
getSelf().sendDeliveryOrderMessage(order, deliveryReqVO); getSelf().sendDeliveryOrderMessage(order, deliveryReqVO);
} }

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
View File

@ -73,7 +73,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
public class SocialClientServiceImpl implements SocialClientService { public class SocialClientServiceImpl implements SocialClientService {
/** /**
* 小程序版本 * 小程序码要打开的小程序版本
* *
* 1. release：正式版 * 1. release：正式版
* 2. trial：体验版 * 2. trial：体验版
@ -81,6 +81,11 @@ public class SocialClientServiceImpl implements SocialClientService {
*/ */
@Value("${yudao.wxa-code.env-version:release}") @Value("${yudao.wxa-code.env-version:release}")
public String envVersion; public String envVersion;
/**
* 订阅消息跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；
*/
@Value("${yudao.wxa-subscribe-message.miniprogram-state:formal}")
public String miniprogramState;
@Resource @Resource
private AuthRequestFactory authRequestFactory; private AuthRequestFactory authRequestFactory;
@ -307,7 +312,7 @@ public class SocialClientServiceImpl implements SocialClientService {
String templateId, String openId) { String templateId, String openId) {
// 设置订阅消息基本参数 // 设置订阅消息基本参数
WxMaSubscribeMessage subscribeMessage = new WxMaSubscribeMessage().setLang(WxMaConstants.MiniProgramLang.ZH_CN) WxMaSubscribeMessage subscribeMessage = new WxMaSubscribeMessage().setLang(WxMaConstants.MiniProgramLang.ZH_CN)
.setMiniprogramState(envVersion).setTemplateId(templateId).setToUser(openId).setPage(reqDTO.getPage()); .setMiniprogramState(miniprogramState).setTemplateId(templateId).setToUser(openId).setPage(reqDTO.getPage());
// 设置具体消息参数 // 设置具体消息参数
Map<String, String> messages = reqDTO.getMessages(); Map<String, String> messages = reqDTO.getMessages();
if (CollUtil.isNotEmpty(messages)) { if (CollUtil.isNotEmpty(messages)) {

2
yudao-server/src/main/resources/application-local.yaml
View File

@ -223,6 +223,8 @@ yudao:
demo: false # 关闭演示模式 demo: false # 关闭演示模式
wxa-code: wxa-code:
env-version: develop # 小程序版本: 正式版为 "release"；体验版为 "trial"；开发版为 "develop" env-version: develop # 小程序版本: 正式版为 "release"；体验版为 "trial"；开发版为 "develop"
wxa-subscribe-message:
miniprogram-state: developer # 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
justauth: justauth: