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 | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 62 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 9011f17..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,24 +1,14 @@
package com.java110.job.task.wechat;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
-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.oweFeeCallable.OweFeeCallableDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.reportFee.ReportOweFeeDto;
-import com.java110.dto.wechat.SmallWeChatDto;
-import com.java110.dto.wechat.SmallWechatAttrDto;
import com.java110.dto.task.TaskDto;
-import com.java110.dto.wechat.Content;
-import com.java110.dto.wechat.Data;
-import com.java110.dto.wechat.Miniprogram;
-import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IOweFeeCallableV1InnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
@@ -37,15 +27,13 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
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
@@ -124,26 +112,29 @@
}
for (ReportOweFeeDto fee : reportOweFeeDtos) {
+ if(StringUtil.isEmpty(fee.getOwnerId())){
+ continue;
+ }
oweFeeCallablePo = new OweFeeCallablePo();
- oweFeeCallablePo.setAmountdOwed(reportOweFeeDto.getAmountOwed());
+ oweFeeCallablePo.setAmountdOwed(fee.getAmountOwed());
oweFeeCallablePo.setCallableWay(notifyWay);
oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId("11"));
- oweFeeCallablePo.setFeeId(reportOweFeeDto.getFeeId());
- oweFeeCallablePo.setFeeName(reportOweFeeDto.getFeeName());
+ oweFeeCallablePo.setFeeId(fee.getFeeId());
+ oweFeeCallablePo.setFeeName(fee.getFeeName());
oweFeeCallablePo.setCommunityId(communityDto.getCommunityId());
- oweFeeCallablePo.setConfigId(reportOweFeeDto.getConfigId());
- oweFeeCallablePo.setOwnerId(reportOweFeeDto.getOwnerId());
- oweFeeCallablePo.setOwnerName(reportOweFeeDto.getOwnerName());
+ oweFeeCallablePo.setConfigId(fee.getConfigId());
+ oweFeeCallablePo.setOwnerId(fee.getOwnerId());
+ oweFeeCallablePo.setOwnerName(fee.getOwnerName());
oweFeeCallablePo.setPayerObjId(fee.getPayerObjId());
- oweFeeCallablePo.setPayerObjName(reportOweFeeDto.getPayerObjName());
- oweFeeCallablePo.setPayerObjType(reportOweFeeDto.getPayerObjType());
+ oweFeeCallablePo.setPayerObjName(fee.getPayerObjName());
+ oweFeeCallablePo.setPayerObjType(fee.getPayerObjType());
oweFeeCallablePo.setRemark("绯荤粺鑷姩鍌即");
oweFeeCallablePo.setStaffId("-1");
oweFeeCallablePo.setStaffName("绯荤粺鑷姩鍌即");
oweFeeCallablePo.setState(OweFeeCallableDto.STATE_WAIT);
- oweFeeCallablePo.setStartTime(reportOweFeeDto.getEndTime());
- oweFeeCallablePo.setEndTime(reportOweFeeDto.getDeadlineTime());
+ oweFeeCallablePo.setStartTime(fee.getEndTime());
+ oweFeeCallablePo.setEndTime(fee.getDeadlineTime());
oweFeeCallablePos.add(oweFeeCallablePo);
}
@@ -163,49 +154,98 @@
OweFeeCallablePo updateOweFeeCallablePo = null;
OwnerAppUserDto ownerAppUserDto = null;
- for (OweFeeCallablePo tmpOweFeeCallablePo : oweFeeCallablePos) {
- 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;
+
+ 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);
+
}
- 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.size() < 1){
- updateOweFeeCallablePo = new OweFeeCallablePo();
- updateOweFeeCallablePo.setOfcId(tmpOweFeeCallablePo.getOfcId());
- updateOweFeeCallablePo.setCommunityId(tmpOweFeeCallablePo.getCommunityId());
- updateOweFeeCallablePo.setState(OweFeeCallableDto.STATE_FAIL);
- updateOweFeeCallablePo.setRemark(tmpOweFeeCallablePo.getRemark() + "-涓氫富鏈粦瀹�");
- oweFeeCallableV1InnerServiceSMOImpl.updateOweFeeCallable(updateOweFeeCallablePo);
+ if (contents.isEmpty()) {
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);
- ResultVo resultVo = MsgNotifyFactory.sendOweFeeMsg(communityDto.getCommunityId(), ownerAppUserDtos.get(0).getUserId(), content);
- 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);
+ //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);
}
- 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