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 | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 5ac8c58..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
@@ -112,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);
}
@@ -159,6 +162,7 @@
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("-")) {
@@ -184,13 +188,13 @@
ownerAppUserDto.setCommunityId(tmpOweFeeCallablePo.getCommunityId());
ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
+ if (ownerAppUserDtos != null && !ownerAppUserDtos.isEmpty()) {
userId = ownerAppUserDtos.get(0).getUserId();
}
contents.add(content);
}
- if (contents.size() < 1) {
+ if (contents.isEmpty()) {
continue;
}
--
Gitblit v1.8.0