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 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 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 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 UserMoneyDetails.getType() == 1)