|
|
@@ -1482,8 +1482,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str = getString(e, out, count, yxyCount, zxsCount,qtCount,useOyd);
|
|
|
str=str+",未归集:"+countAmount.stripTrailingZeros().toPlainString()+"元";
|
|
|
orderList.add(str);
|
|
|
- }
|
|
|
- if (e.getPrid() !=null){
|
|
|
+ }else if (e.getPrid() !=null){
|
|
|
//获取未归集的订单
|
|
|
List<PublicReleaseDetails> list = publicReleaseMapper.selectDetailsByPrid(e.getPrid());
|
|
|
|
|
|
@@ -1492,7 +1491,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
User user = userMapper.selectByPrimaryKey(e2.getUid());
|
|
|
List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
|
|
|
BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
- sb.append(user.getNickname()).append(",未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");
|
|
|
+ sb.append("[").append(user.getNickname()).append("]未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");
|
|
|
}
|
|
|
orderList.add(sb.substring(0,sb.length()-1));
|
|
|
}
|