From 22d7512ecb341426ecaa5ac8d48d7aa2b37c1059 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 09 六月 2022 16:27:41 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 101 ++++++++++++++++++++++++++++++++------------------
1 files changed, 65 insertions(+), 36 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 38bb4b0..9cf36cb
--- 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,8 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
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;
@@ -22,7 +24,6 @@
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;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -98,7 +99,7 @@
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
+ logger.error("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
return;
}
SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
@@ -111,7 +112,7 @@
List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
+ logger.error("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
return;
}
@@ -119,8 +120,8 @@
String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
- if (accessToken == null || accessToken == "") {
- logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
+ if (StringUtil.isEmpty(accessToken)) {
+ logger.error("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
@@ -131,12 +132,15 @@
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
if (ownerAppUserDtos.size() <= 0 || ownerAppUserDtos == null) {
- logger.info("鏈煡璇㈠埌涓氫富涓庡井淇″叕浼楀彿缁戝畾鍏崇郴");
+ logger.error("鏈煡璇㈠埌涓氫富涓庡井淇″叕浼楀彿缁戝畾鍏崇郴");
return;
}
List<String> memberIdList = new ArrayList<>(ownerAppUserDtos.size());
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
+ if (StringUtil.isEmpty(appUserDto.getMemberId()) || "-1".equals(appUserDto.getMemberId())) {
+ continue;
+ }
memberIdList.add(appUserDto.getMemberId());
}
@@ -149,46 +153,71 @@
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]);
+ 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;
+ if (oweRoomUrl.contains("@@")) {
+ miniprogram = new Miniprogram();
+ 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);
+ 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());
- } else {
- miniprogram.setPagepath(oweUrl.split("@@")[1] + fee.getPayObjId());
- 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