From 22fd7e61289cdad5ad542a14d19a667f833e7465 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 11 四月 2021 11:32:42 +0800
Subject: [PATCH] 优化物业通知 特殊字符空格bug
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
index 4007d7c..81f2b21 100644
--- a/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java
@@ -4,6 +4,7 @@
import com.java110.core.factory.WechatFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.BillOweFeeDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
@@ -19,6 +20,7 @@
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -118,7 +120,7 @@
String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
- if (accessToken == null || accessToken == "") {
+ if (StringUtil.isEmpty(accessToken)) {
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
@@ -149,35 +151,44 @@
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
String url = sendMsgUrl + accessToken;
- String oweUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
+ String oweRoomUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
+ String oweCarUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
Miniprogram miniprogram = null;
- if (oweUrl.contains("@@")) {
+ if (oweRoomUrl.contains("@@")) {
miniprogram = new Miniprogram();
- miniprogram.setAppid(oweUrl.split("@@")[0]);
+ miniprogram.setAppid(oweRoomUrl.split("@@")[0]);
}
+ //杞﹁締璐圭敤
+ if (oweCarUrl.contains("@@")) {
+ miniprogram = new Miniprogram();
+ miniprogram.setAppid(oweCarUrl.split("@@")[0]);
+ }
+
+ String oweUrl = "";
for (BillOweFeeDto fee : billOweFeeDtos) {
+ oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(fee.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
if (fee.getOwnerId().equals(appUserDto.getMemberId())) {
Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(fee.getFeeEndTime());
Calendar now = Calendar.getInstance();
now.setTime(date);
- int year = now.get(Calendar.YEAR);
- int month = now.get(Calendar.MONTH);
+// int year = now.get(Calendar.YEAR);
+// int month = now.get(Calendar.MONTH);
Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(appUserDto.getOpenId());
/*data.setFirst(new Content("鐗╀笟璐圭即璐规彁閱�"));*/
- data.setFirst(new Content(fee.getFeeTypeCd()+"鎻愰啋"));
+ data.setFirst(new Content(fee.getFeeTypeName() + "鎻愰啋"));
data.setKeyword1(new Content(fee.getPayerObjName()));
- data.setKeyword2(new Content(year + "骞�-" + month + "鏈�"));
- data.setKeyword3(new Content(fee.getAmountOwed()));
+ data.setKeyword2(new Content(DateUtil.dateTimeToDate(fee.getFeeEndTime()) + "鑷�" + DateUtil.dateTimeToDate(fee.getDeadlineTime())));
+ data.setKeyword3(new Content(fee.getBillAmountOwed()));
data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
if (!StringUtil.isEmpty(oweUrl)) {
if (miniprogram == null) {
- templateMessage.setUrl(oweUrl + fee.getPayObjId());
+ templateMessage.setUrl(oweUrl + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
} else {
- miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId());
+ miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
templateMessage.setMiniprogram(miniprogram);
}
}
--
Gitblit v1.8.0