From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
index c1fcb23..9a5b7b7 100644
--- a/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java
@@ -7,7 +7,7 @@
import com.java110.core.factory.WechatFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeCollectionOrder.FeeCollectionOrderDto;
+import com.java110.dto.fee.FeeCollectionOrderDto;
import com.java110.dto.logSystemError.LogSystemErrorDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
@@ -36,6 +36,7 @@
import com.java110.po.logSystemError.LogSystemErrorPo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
@@ -296,7 +297,7 @@
oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportOweFeeDo.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
String[] roomName = new String[]{};
if ("3333".equals(reportOweFeeDo.getPayerObjType())) {
- roomName = itemDto.getPayerObjName().split("-");
+ roomName = itemDto.getPayerObjName().split("-",3);
}
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
try {
@@ -386,6 +387,11 @@
param.put("date2", DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B));
param.put("mount", reportOweFeeDo.getAmountOwed());
paramIn = param;
+ }else if(SendSmsFactory.SMS_COMPANY_YIDONG.equals(smsConfigDto1.getSmsType())){
+ paramIn = "灏婃暚鐨勪笟涓�"+ reportOweFeeDo.getOwnerName()+"锛屾偍"+reportOweFeeDo.getPayerObjName()+"鐨�"+itemDtos.get(0).getFeeName()
+ +"锛岃处鍗曟棩鏈�"+DateUtil.getFormatTimeString(itemDtos.get(0).getStartTime(), DateUtil.DATE_FORMATE_STRING_B)
+ +"鑷�"+DateUtil.getFormatTimeString(endTime, DateUtil.DATE_FORMATE_STRING_B)
+ +"锛岀即璐归噾棰濓細"+reportOweFeeDo.getAmountOwed()+"鍏冿紝璇峰強鏃剁即璐�";
} else {
paramIn = new String[]{
reportOweFeeDo.getOwnerName(),
@@ -462,8 +468,8 @@
}
String url = sendTemplate + accessToken;
- String oweRoomUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
- String oweCarUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
+ String oweRoomUrl = UrlCache.getOwnerUrl()+MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
+ String oweCarUrl = UrlCache.getOwnerUrl()+MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_CAR_FEE_PAGE);
Miniprogram miniprogram = null;
if (oweRoomUrl.contains("@@")) {
miniprogram = new Miniprogram();
--
Gitblit v1.8.0