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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 24 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 53c85ca..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,17 +2,25 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-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;
import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
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;
@@ -20,8 +28,10 @@
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -31,7 +41,7 @@
* @create: 2020-06-15 13:35
**/
@Component
-public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
+public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {
private static Logger logger = LoggerFactory.getLogger(PublicWeChatPushMessageTemplate.class);
@@ -40,6 +50,9 @@
@Autowired
private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
+
+ @Autowired
+ private ISmallWechatAttrInnerServiceSMO smallWechatAttrInnerServiceSMOImpl;
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
@@ -51,45 +64,79 @@
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
//妯℃澘id
- private static String templateId = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";
-
+ private static String DEFAULT_TEMPLATE_ID = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";
@Override
- protected void process(TaskDto taskDto) throws Exception {
+ protected void process(TaskDto taskDto) {
logger.debug("寮�濮嬫墽琛屽井淇℃ā鏉夸俊鎭帹閫�" + taskDto.toString());
+
+ // 鑾峰彇灏忓尯
+ List<CommunityDto> communityDtos = getAllCommunity();
+
+ for (CommunityDto communityDto : communityDtos) {
+ try {
+ publishMsg(taskDto, communityDto);
+ } catch (Exception e) {
+ logger.error("鎺ㄩ�佹秷鎭け璐�", e);
+ }
+ }
+ }
+
+ private void publishMsg(TaskDto taskDto, CommunityDto communityDto) throws Exception {
+
+//
+// String templateId = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.KEY_PROPERTY_FEE_TEMPLATE_ID);
+//
+// templateId = StringUtil.isEmpty(templateId) ? DEFAULT_TEMPLATE_ID : templateId;
//鏌ヨ鍏紬鍙烽厤缃�
SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setWeChatType("1100");
+ smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
+ smallWeChatDto.setObjId(communityDto.getCommunityId());
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- if(smallWeChatDtos.size() <=0 || smallWeChatDto == null){
+ if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
return;
}
-
SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
- String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(),weChatDto.getAppSecret());
- if(accessToken == null || accessToken == ""){
- logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}",accessToken);
+
+ SmallWechatAttrDto smallWechatAttrDto = new SmallWechatAttrDto();
+ smallWechatAttrDto.setCommunityId(communityDto.getCommunityId());
+ smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
+ smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_OWE_FEE_TEMPLATE);
+ List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
+
+ if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
+ logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
+ return;
+ }
+
+ String templateId = smallWechatAttrDtos.get(0).getValue();
+
+ String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
+
+ if (accessToken == null || accessToken == "") {
+ logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
//鏍规嵁灏忓尯id鏌ヨ涓氫富涓庡叕浼楀彿缁戝畾淇℃伅
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setCommunityId(weChatDto.getObjId());
- ownerAppUserDto.setAppType("WECHAT");
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- if(ownerAppUserDtos.size() <=0 || ownerAppUserDtos == null){
+ if (ownerAppUserDtos.size() <= 0 || ownerAppUserDtos == null) {
logger.info("鏈煡璇㈠埌涓氫富涓庡井淇″叕浼楀彿缁戝畾鍏崇郴");
return;
}
List<String> memberIdList = new ArrayList<>(ownerAppUserDtos.size());
- for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
+ for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
memberIdList.add(appUserDto.getMemberId());
}
@@ -99,25 +146,46 @@
billOweFeeDto.setCommunityId(weChatDto.getObjId());
billOweFeeDto.setOwnerIds(memberIds);
billOweFeeDto.setState("1000");
+ billOweFeeDto.setCurBill("T");
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
String url = sendMsgUrl + accessToken;
- for( BillOweFeeDto fee : billOweFeeDtos){
- for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
- if(fee.getOwnerId().equals(appUserDto.getMemberId())){
+ 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);
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(fee.getFeeEndTime()));
- 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);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}",responseEntity);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
}
}
--
Gitblit v1.8.0