From c19bf08d99961904b21226c918fb019bdcf4b0b4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 20 十月 2023 20:20:35 +0800
Subject: [PATCH] 优化代码

---
 service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java
index 220dda9..bf0a4dd 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java
@@ -94,10 +94,18 @@
         OwnerAppUserDto ownerAppUserDto = null;
         String userId = "";
         List<JSONObject> contents = null;
+
+        //todo 鎸夋埧灞嬪彂閫�
         for (int roomIndex = 0; roomIndex < roomIds.size(); roomIndex++) {
             contents = new ArrayList<>();
             String notifyWay = MsgNotifyFactory.NOTIFY_WAY_WECHAT;
+            userId = "";
             for (OweFeeCallablePo oweFeeCallablePo : oweFeeCallablePos) {
+                if (!oweFeeCallablePo.getPayerObjId().equals(roomIds.getString(roomIndex))) {
+                    continue;
+                }
+
+                //todo 涓氫富涓嶅瓨鍦�
                 if (StringUtil.isEmpty(oweFeeCallablePo.getOwnerId()) || oweFeeCallablePo.getOwnerId().startsWith("-")) {
                     updateOweFeeCallablePo = new OweFeeCallablePo();
                     updateOweFeeCallablePo.setOfcId(oweFeeCallablePo.getOfcId());
@@ -131,12 +139,13 @@
 
             }
 
-            if (contents.size() < 1) {
-                continue;
+            if (contents.isEmpty()) {
+                return;
             }
 
             //todo 鍌即
             ResultVo resultVo = MsgNotifyFactory.sendOweFeeMsg(data.getString("communityId"), userId, oweFeeCallablePos.get(0).getOwnerId(), contents, notifyWay);
+
             for (OweFeeCallablePo oweFeeCallablePo : oweFeeCallablePos) {
                 if (StringUtil.isEmpty(oweFeeCallablePo.getOwnerId()) || oweFeeCallablePo.getOwnerId().startsWith("-")) {
                     continue;
@@ -152,6 +161,7 @@
                 }
                 oweFeeCallableV1InnerServiceSMOImpl.updateOweFeeCallable(updateOweFeeCallablePo);
             }
+
         }
     }
 
@@ -282,9 +292,7 @@
             return true;
         }
 
-        if (DateUtil.getDateFromStringB(tempFeeDto.getEndTime()).before(DateUtil.getDateFromStringB(startTime))
-                && DateUtil.getDateFromStringB(tempFeeDto.getDeadlineTime()).after(DateUtil.getDateFromStringB(endTime))
-        ) {
+        if (DateUtil.getDateFromStringB(tempFeeDto.getEndTime()).before(DateUtil.getDateFromStringB(startTime)) && DateUtil.getDateFromStringB(tempFeeDto.getDeadlineTime()).after(DateUtil.getDateFromStringB(endTime))) {
             return true;
         }
 

--
Gitblit v1.8.0