|
|
@@ -1436,7 +1436,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
List<String> orderList = new ArrayList<>();
|
|
|
List<SonExpenseAccount> orderSonList = new ArrayList<>();
|
|
|
sonList.stream().forEach(e -> {
|
|
|
- if (!orderList.contains(e.getOrderNo())){
|
|
|
+ if (e.getOrderNo()==null){
|
|
|
+ orderSonList.add(e);
|
|
|
+ }else if (!orderList.contains(e.getOrderNo())){
|
|
|
orderList.add(e.getOrderNo());
|
|
|
orderSonList.add(e);
|
|
|
}
|
|
|
@@ -1499,7 +1501,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
//获取未归集的订单
|
|
|
List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getOrderNoNotCountAmount(e.getOrderNo());
|
|
|
BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -1509,8 +1510,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}else if (e.getPrid() !=null){
|
|
|
//获取未归集的订单
|
|
|
List<PublicReleaseDetails> list = publicReleaseMapper.selectDetailsByPrid(e.getPrid());
|
|
|
-
|
|
|
- StringBuffer sb = new StringBuffer();
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
for (PublicReleaseDetails e2 : list) {
|
|
|
User user = userMapper.queryById(e2.getUid());
|
|
|
List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
|
|
|
@@ -2014,4 +2014,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
}
|