From 7fca0ff445f4c19d547daf71b47201505cb2b9c0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 01 十一月 2023 14:36:22 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java | 271 +++++++++++++++++++++++++++++++----------------------
1 files changed, 159 insertions(+), 112 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 c041735..870bd6b 100755
--- 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
@@ -1,39 +1,39 @@
package com.java110.job.task.wechat;
-import com.alibaba.fastjson.JSON;
-import com.java110.core.factory.WechatFactory;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+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.oweFeeCallable.OweFeeCallableDto;
import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
+import com.java110.dto.reportFee.ReportOweFeeDto;
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.fee.IOweFeeCallableV1InnerServiceSMO;
+import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.job.msgNotify.MsgNotifyFactory;
import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.po.oweFeeCallable.OweFeeCallablePo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
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;
import org.springframework.web.client.RestTemplate;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @program: MicroCommunity
@@ -59,7 +59,13 @@
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
@Autowired
+ private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
+
+ @Autowired
private RestTemplate outRestTemplate;
+
+ @Autowired
+ private IOweFeeCallableV1InnerServiceSMO oweFeeCallableV1InnerServiceSMOImpl;
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -86,119 +92,160 @@
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;
+ ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
+ reportOweFeeDto.setCommunityId(communityDto.getCommunityId());
+ reportOweFeeDto.setHasOweFee("Y");
- //鏌ヨ鍏紬鍙烽厤缃�
- SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setWeChatType("1100");
- smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
- smallWeChatDto.setObjId(communityDto.getCommunityId());
- List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
+ List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
- if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
- return;
- }
- SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
-
-
- 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("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
+ if (reportOweFeeDtos == null || reportOweFeeDtos.size() < 1) {
return;
}
- String templateId = smallWechatAttrDtos.get(0).getValue();
+ OweFeeCallablePo oweFeeCallablePo = null;
+ List<OweFeeCallablePo> oweFeeCallablePos = new ArrayList<>();
+ String notifyWay = MappingCache.getValue(MappingConstant.ENV_DOMAIN, "DEFAULT_MSG_NOTIFY_WAY");
+ if (StringUtil.isEmpty(notifyWay) || MsgNotifyFactory.NOTIFY_WAY_WECHAT.equals(notifyWay)) {
+ notifyWay = OweFeeCallableDto.CALLABLE_WAY_WECHAT;
+ } else {
+ notifyWay = OweFeeCallableDto.CALLABLE_WAY_SMS;
+ }
- String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
+ for (ReportOweFeeDto fee : reportOweFeeDtos) {
+ if(StringUtil.isEmpty(fee.getOwnerId())){
+ continue;
+ }
+ oweFeeCallablePo = new OweFeeCallablePo();
- if (accessToken == null || accessToken == "") {
- logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
+ oweFeeCallablePo.setAmountdOwed(fee.getAmountOwed());
+ oweFeeCallablePo.setCallableWay(notifyWay);
+ oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId("11"));
+ oweFeeCallablePo.setFeeId(fee.getFeeId());
+ oweFeeCallablePo.setFeeName(fee.getFeeName());
+ oweFeeCallablePo.setCommunityId(communityDto.getCommunityId());
+ oweFeeCallablePo.setConfigId(fee.getConfigId());
+ oweFeeCallablePo.setOwnerId(fee.getOwnerId());
+ oweFeeCallablePo.setOwnerName(fee.getOwnerName());
+ oweFeeCallablePo.setPayerObjId(fee.getPayerObjId());
+ oweFeeCallablePo.setPayerObjName(fee.getPayerObjName());
+ oweFeeCallablePo.setPayerObjType(fee.getPayerObjType());
+ oweFeeCallablePo.setRemark("绯荤粺鑷姩鍌即");
+ oweFeeCallablePo.setStaffId("-1");
+ oweFeeCallablePo.setStaffName("绯荤粺鑷姩鍌即");
+ oweFeeCallablePo.setState(OweFeeCallableDto.STATE_WAIT);
+ oweFeeCallablePo.setStartTime(fee.getEndTime());
+ oweFeeCallablePo.setEndTime(fee.getDeadlineTime());
+ oweFeeCallablePos.add(oweFeeCallablePo);
+
+ }
+
+ if (oweFeeCallablePos.size() < 1) {
return;
}
- //鏍规嵁灏忓尯id鏌ヨ涓氫富涓庡叕浼楀彿缁戝畾淇℃伅
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setCommunityId(weChatDto.getObjId());
- ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
- if (ownerAppUserDtos.size() <= 0 || ownerAppUserDtos == null) {
- logger.info("鏈煡璇㈠埌涓氫富涓庡井淇″叕浼楀彿缁戝畾鍏崇郴");
- return;
+ int flag = oweFeeCallableV1InnerServiceSMOImpl.saveOweFeeCallables(oweFeeCallablePos);
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇濆瓨鍌即璁板綍澶辫触");
}
-
- List<String> memberIdList = new ArrayList<>(ownerAppUserDtos.size());
- for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
- memberIdList.add(appUserDto.getMemberId());
- }
-
- String[] memberIds = memberIdList.toArray(new String[memberIdList.size()]);
- //鏌ヨ娆犺垂淇℃伅
- BillOweFeeDto billOweFeeDto = new BillOweFeeDto();
- billOweFeeDto.setCommunityId(weChatDto.getObjId());
- billOweFeeDto.setOwnerIds(memberIds);
- billOweFeeDto.setState("1000");
- billOweFeeDto.setCurBill("T");
- List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
-
- String url = sendMsgUrl + 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);
-// 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);
- }
- }
- templateMessage.setData(data);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ JSONObject content = null;
+ 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);
+
+ OweFeeCallablePo updateOweFeeCallablePo = null;
+ OwnerAppUserDto ownerAppUserDto = null;
+
+ ResultVo resultVo = null;
+ String userId = "";
+
+ //todo 鏍规嵁鎴垮眿鍙戦�佹瑺璐逛俊鎭�
+ Map<String, List<OweFeeCallablePo>> roomOweFeeCallables = computeRoomOweFeeCallable(oweFeeCallablePos);
+ List<JSONObject> contents = null;
+ for (String key : roomOweFeeCallables.keySet()) {
+ userId = "";
+ contents = new ArrayList<>();
+ for (OweFeeCallablePo tmpOweFeeCallablePo : roomOweFeeCallables.get(key)) {
+ if (StringUtil.isEmpty(tmpOweFeeCallablePo.getOwnerId()) || tmpOweFeeCallablePo.getOwnerId().startsWith("-")) {
+ updateOweFeeCallablePo = new OweFeeCallablePo();
+ updateOweFeeCallablePo.setOfcId(tmpOweFeeCallablePo.getOfcId());
+ updateOweFeeCallablePo.setCommunityId(tmpOweFeeCallablePo.getCommunityId());
+ updateOweFeeCallablePo.setState(OweFeeCallableDto.STATE_FAIL);
+ updateOweFeeCallablePo.setRemark(tmpOweFeeCallablePo.getRemark() + "-涓氫富涓嶅瓨鍦�");
+ oweFeeCallableV1InnerServiceSMOImpl.updateOweFeeCallable(updateOweFeeCallablePo);
+ continue;
}
+
+ oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(tmpOweFeeCallablePo.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
+ content = new JSONObject();
+ content.put("feeTypeName", tmpOweFeeCallablePo.getFeeName());
+ content.put("payerObjName", tmpOweFeeCallablePo.getPayerObjName());
+ content.put("billAmountOwed", tmpOweFeeCallablePo.getAmountdOwed());
+ content.put("date", DateUtil.dateTimeToDate(tmpOweFeeCallablePo.getStartTime()) + "~" + DateUtil.dateTimeToDate(tmpOweFeeCallablePo.getEndTime()));
+ content.put("url", oweUrl);
+
+ ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setMemberId(tmpOweFeeCallablePo.getOwnerId());
+ ownerAppUserDto.setCommunityId(tmpOweFeeCallablePo.getCommunityId());
+ ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if (ownerAppUserDtos != null && !ownerAppUserDtos.isEmpty()) {
+ userId = ownerAppUserDtos.get(0).getUserId();
+ }
+ contents.add(content);
+
+ }
+ if (contents.isEmpty()) {
+ continue;
+ }
+
+ //todo 鍙戦�佹帹閫佹秷鎭�
+ resultVo = MsgNotifyFactory.sendOweFeeMsg(communityDto.getCommunityId(), userId, roomOweFeeCallables.get(key).get(0).getOwnerId(), contents);
+
+
+ for (OweFeeCallablePo tmpOweFeeCallablePo : roomOweFeeCallables.get(key)) {
+ if (StringUtil.isEmpty(tmpOweFeeCallablePo.getOwnerId()) || tmpOweFeeCallablePo.getOwnerId().startsWith("-")) {
+ continue;
+ }
+ updateOweFeeCallablePo = new OweFeeCallablePo();
+ updateOweFeeCallablePo.setOfcId(tmpOweFeeCallablePo.getOfcId());
+ updateOweFeeCallablePo.setCommunityId(tmpOweFeeCallablePo.getCommunityId());
+ if (resultVo.getCode() != ResultVo.CODE_OK) {
+ updateOweFeeCallablePo.setState(OweFeeCallableDto.STATE_FAIL);
+ updateOweFeeCallablePo.setRemark(tmpOweFeeCallablePo.getRemark() + "-" + resultVo.getMsg());
+ } else {
+ updateOweFeeCallablePo.setState(OweFeeCallableDto.STATE_COMPLETE);
+ }
+ oweFeeCallableV1InnerServiceSMOImpl.updateOweFeeCallable(updateOweFeeCallablePo);
}
}
+
+
+ }
+
+ /**
+ * 鏍规嵁鎴垮眿
+ *
+ * @param oweFeeCallablePos
+ * @return
+ */
+ private Map<String, List<OweFeeCallablePo>> computeRoomOweFeeCallable(List<OweFeeCallablePo> oweFeeCallablePos) {
+
+ Map<String, List<OweFeeCallablePo>> infos = new HashMap<>();
+
+ List<OweFeeCallablePo> tmps = null;
+ for (OweFeeCallablePo oweFeeCallablePo : oweFeeCallablePos) {
+ if (infos.containsKey(oweFeeCallablePo.getPayerObjId())) {
+ tmps = infos.get(oweFeeCallablePo.getPayerObjId());
+ tmps.add(oweFeeCallablePo);
+ continue;
+ }
+
+ tmps = new ArrayList<>();
+ tmps.add(oweFeeCallablePo);
+ infos.put(oweFeeCallablePo.getPayerObjId(), tmps);
+ }
+
+ return infos;
}
}
--
Gitblit v1.8.0