From cb921ad901790925db64afc1bcbafb678e8a12b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 八月 2023 09:42:17 +0800
Subject: [PATCH] 优化完成催缴短信方式
---
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
index 4910382..058b9dd 100755
--- a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
@@ -9,22 +9,22 @@
import com.java110.core.factory.WechatFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.ISaveTransactionLogSMO;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.app.AppDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.logSystemError.LogSystemErrorDto;
+import com.java110.dto.log.LogSystemErrorDto;
import com.java110.dto.notice.NoticeDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.wechat.SmallWechatAttrDto;
import com.java110.dto.task.TaskDto;
-import com.java110.dto.wechatSubscribe.WechatSubscribeDto;
-import com.java110.entity.wechat.Content;
-import com.java110.entity.wechat.Data;
-import com.java110.entity.wechat.Miniprogram;
-import com.java110.entity.wechat.PropertyFeeTemplateMessage;
+import com.java110.dto.wechat.WechatSubscribeDto;
+import com.java110.dto.wechat.Content;
+import com.java110.dto.wechat.Data;
+import com.java110.dto.wechat.Miniprogram;
+import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.community.INoticeInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
@@ -34,14 +34,14 @@
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IWechatSubscribeV1InnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
-import com.java110.po.logSystemError.LogSystemErrorPo;
-import com.java110.po.transactionLog.TransactionLogPo;
-import com.java110.po.wechatSubscribe.WechatSubscribePo;
+import com.java110.po.log.LogSystemErrorPo;
+import com.java110.po.log.TransactionLogPo;
+import com.java110.po.wechat.WechatSubscribePo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.cache.UrlCache;
-import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
@@ -368,7 +368,7 @@
String wechatUrl = UrlCache.getOwnerUrl();
Miniprogram miniprogram = null;
if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
- miniprogram = new Miniprogram();
+ //miniprogram = new Miniprogram();
} else {
miniprogram = new Miniprogram();
miniprogram.setAppid(wechatUrl);
@@ -390,7 +390,8 @@
data.setKeyword2(new Content(noticeDto.getStartTime()));
data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
- templateMessage.setData(data);
+ templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
if (!StringUtil.isEmpty(wechatUrl)) {
if (miniprogram == null) {
templateMessage.setUrl(wechatUrl + "/#/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
@@ -477,7 +478,8 @@
data.setKeyword2(new Content(noticeDto.getStartTime()));
data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
- templateMessage.setData(data);
+ templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
//鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = UrlCache.getOwnerUrl();
if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
@@ -568,7 +570,8 @@
data.setKeyword2(new Content(noticeDto.getStartTime()));
data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
- templateMessage.setData(data);
+ templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
--
Gitblit v1.8.0