From a4dcca761cfe73acca8b9dc0a0d664451d5cc89a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 六月 2021 14:15:31 +0800
Subject: [PATCH] 优化消息发布功能
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 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
old mode 100644
new mode 100755
index 81f2b21..676b12a
--- 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
@@ -150,7 +150,12 @@
billOweFeeDto.setCurBill("T");
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
- String url = sendMsgUrl + accessToken;
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.SEND_TEMPLATE_URL);
+ if (StringUtil.isEmpty(sendTemplate)) {
+ sendTemplate = sendMsgUrl;
+ }
+ 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);
Miniprogram miniprogram = null;
@@ -168,37 +173,48 @@
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);
+ try {
+ 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);
- 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.getFeeTypeName() + "鎻愰啋"));
- data.setKeyword1(new Content(fee.getPayerObjName()));
- 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() + "&wAppId=" + weChatDto.getAppId());
- } else {
- miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
- templateMessage.setMiniprogram(miniprogram);
+ 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.getFeeTypeName() + "鎻愰啋"));
+ data.setKeyword1(new Content(fee.getPayerObjName()));
+ data.setKeyword2(new Content(fee.getBillAmountOwed()));
+ data.setKeyword3(new Content(DateUtil.dateTimeToDate(fee.getFeeEndTime()) + "鑷�" + DateUtil.dateTimeToDate(fee.getDeadlineTime())));
+ data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂,濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
+ if (!StringUtil.isEmpty(oweUrl)) {
+ if (miniprogram == null) {
+ templateMessage.setUrl(oweUrl + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
+ } else {
+ miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId() + "&wAppId=" + weChatDto.getAppId());
+ templateMessage.setMiniprogram(miniprogram);
+ }
}
+ templateMessage.setData(data);
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
}
- templateMessage.setData(data);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ } catch (Exception e) {
+ logger.error("鎺ㄩ�佽处鍗曞紓甯�", e);
}
}
+ BillOweFeeDto tmpBillOweFeeDto = new BillOweFeeDto();
+ tmpBillOweFeeDto.setFeeId(fee.getFeeId());
+ tmpBillOweFeeDto.setCommunityId(fee.getCommunityId());
+ tmpBillOweFeeDto.setBillId(fee.getBillId());
+ tmpBillOweFeeDto.setState(BillOweFeeDto.STATE_SEND_OWNER);
+ feeInnerServiceSMOImpl.updateBillOweFees(tmpBillOweFeeDto);
+
}
}
}
--
Gitblit v1.8.0