Browse Source

feat(apCheck): 供应商客户列表数据查询去除total判断,前面已经判断

hejq 7 years ago
parent
commit
313744c8e8

+ 4 - 6
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -665,13 +665,11 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
         List<ApCheckAmountDetail> detailList = new ArrayList<>();
         currencySet.forEach(currency -> {
             ApCheckAmountDetail detail = new ApCheckAmountDetail();
+            List<String> totalAmount = customer.getTotalCount().stream()
+                .filter(count -> currency.equals(count.getCurrency()))
+                .map(ApCheckAmount::getAmount).collect(Collectors.toList());
+            detail.setTotalAmount(totalAmount.size() > 0 ? totalAmount.get(0) : null);
             detail.setCurrency(currency);
-            if (!StringUtils.isEmpty(customer.getTotalCount())) {
-                List<String> totalAmount = customer.getTotalCount().stream()
-                    .filter(count -> currency.equals(count.getCurrency()))
-                    .map(ApCheckAmount::getAmount).collect(Collectors.toList());
-                detail.setTotalAmount(totalAmount.size() > 0 ? totalAmount.get(0) : null);
-            }
             if (!StringUtils.isEmpty(customer.getThisMonthCount())) {
                 List<String> thisPeriodAmount = customer.getThisMonthCount().stream()
                     .filter(count -> currency.equals(count.getCurrency()))