From 4cd2e4dda0880f1a53182bd5c439f2ee69750bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 9 Aug 2024 15:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fxy/service/impl/FxyDataServiceImpl.java      | 15 +++++++++------
 .../jjr/service/impl/JjrDataServiceImpl.java      | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java
index 8d16e4f..130d9e9 100644
--- a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java
@@ -79,12 +79,15 @@ public class FxyDataServiceImpl extends ServiceImpl<FxyDataDao, FxyData> impleme
                 .sum();
         result.put("income",income);//累计佣金
         //已提现金额
-        double withdrawal=  filteredPersons2.stream()
-                .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 2)
-                .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2)
-                .filter(UserMoneyDetails -> UserMoneyDetails.getClassify() == 3)
-                .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue())
-                .sum();
+        double withdrawal=0;
+        for(int i=0;i<filteredPersons2.size();i++){
+            UserMoneyDetails umd = filteredPersons2.get(i);
+            if(umd.getType() == 2 && umd.getState() == 2 ){
+                if(umd.getClassify() !=null && umd.getClassify() == 3){
+                    withdrawal += umd.getMoney().doubleValue();
+                }
+            }
+        }
         result.put("withdrawal",withdrawal);//已提现金额
         double notCredited =  filteredPersons2.stream()
                 .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 1)
diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
index 387597a..49bbb4e 100644
--- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrDataServiceImpl.java
@@ -120,12 +120,15 @@ public class JjrDataServiceImpl extends ServiceImpl<JjrDataDao, JjrData> impleme
                 .sum();
         result.put("income",income);//累计佣金
         //已提现金额
-        double withdrawal=  filteredPersons2.stream()
-                .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 2)
-                .filter(UserMoneyDetails -> UserMoneyDetails.getState() == 2)
-                .filter(UserMoneyDetails -> UserMoneyDetails.getClassify() == 3)
-                .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue())
-                .sum();
+        double withdrawal=0;
+        for(int i=0;i<filteredPersons2.size();i++){
+            UserMoneyDetails umd = filteredPersons2.get(i);
+            if(umd.getType() == 2 && umd.getState() == 2 ){
+                if(umd.getClassify() !=null && umd.getClassify() == 3){
+                    withdrawal += umd.getMoney().doubleValue();
+                }
+            }
+        }
         result.put("withdrawal",withdrawal);//已提现金额
         double notCredited =  filteredPersons2.stream()
                 .filter(UserMoneyDetails -> UserMoneyDetails.getType() == 1)