From 4db93360932dcee2efddae48152a4ba1f9d7f28b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 12:02:20 +0800
Subject: [PATCH] 优化业主查询报错问题
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 45867c7..38bb4b0 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
@@ -2,10 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
-import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerAppUserInnerServiceSMO;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.owner.OwnerAppUserDto;
@@ -14,8 +10,17 @@
import com.java110.dto.task.TaskDto;
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.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
+import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
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;
import org.springframework.beans.factory.annotation.Autowired;
@@ -141,26 +146,42 @@
billOweFeeDto.setCommunityId(weChatDto.getObjId());
billOweFeeDto.setOwnerIds(memberIds);
billOweFeeDto.setState("1000");
+ billOweFeeDto.setCurBill("T");
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
String url = sendMsgUrl + accessToken;
+ String oweUrl = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.OWE_FEE_PAGE);
+ Miniprogram miniprogram = null;
+ if (oweUrl.contains("@@")) {
+ miniprogram = new Miniprogram();
+ miniprogram.setAppid(oweUrl.split("@@")[0]);
+ }
for (BillOweFeeDto fee : billOweFeeDtos) {
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("鐗╀笟璐圭即璐规彁閱�"));*/
+ 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());
+ } else {
+ miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId());
+ templateMessage.setMiniprogram(miniprogram);
+ }
+ }
templateMessage.setData(data);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
--
Gitblit v1.8.0