feat(应收对账): 应收对账客户列表数据按币别分类统计展示

src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -3,10 +3,13 @@ package com.uas.platform.b2b.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
 import com.uas.platform.b2b.publicapi.model.ApCheckAmount;
+import com.uas.platform.b2b.publicapi.model.ApCheckAmountDetail;
 import com.uas.platform.core.persistence.Logger;
 import com.uas.platform.core.persistence.OtherUserUU;
 import com.uas.platform.core.persistence.StatusColumn;
 import com.uas.platform.core.persistence.UserUU;
+import lombok.Getter;
+import lombok.Setter;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -251,6 +254,12 @@ public class Vendor implements Serializable {
 	@Transient
     private List<ApCheckAmount> apCheckAmounts;
 
+    /**
+     * 对账金额详情
+     */
+	@Transient
+    @Getter@Setter private List<ApCheckAmountDetail> amountDetailList;
+
 	public Long getId() {
 		return id;
 	}

src/main/java/com/uas/platform/b2b/publicapi/model/ApCheckAmountDetail.java

@@ -0,0 +1,48 @@
+package com.uas.platform.b2b.publicapi.model;
+
+import lombok.Data;
+
+/**
+ * 对账金额统计
+ *
+ * @author hejq
+ * @date 2018-12-29 11:06
+ */
+@Data
+public class ApCheckAmountDetail {
+
+    /**
+     * 币别
+     */
+    private String currency;
+
+    /**
+     * 本期应收
+     */
+    private String thisPeriodAmount;
+
+    /**
+     * 本期发货
+     */
+    private Double thisPeriodSendQty;
+
+    /**
+     * 本期未对
+     */
+    private String thisPeriodTodoAmount;
+
+    /**
+     * 本期已对
+     */
+    private String thisPeriodDoneAmount;
+
+    /**
+     * 本期收款
+     */
+    private String thisPeriodReceipt;
+
+    /**
+     * 应收总额
+     */
+    private String totalAmount;
+}

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -148,6 +148,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
             setCheckAmount(erpProdIo, enUU, keyword.getCustomerUU(), checkDate, fromDate, endDate);
             // 查询已生成的对账单（需进行转换）
             List<PurchaseApCheckItemInfo> apCheckList = findApCheckList(enUU, keyword.getCustomerUU(), checkDate, fromDate, endDate, keyword);
+            apCheckList.removeIf(apCheck -> "已作废".equals(apCheck.getApCheck().getCheckStatus()));
             List<ErpProdIODetail> detailList = covertApCheckToErpIo(apCheckList);
             erpProdIo.getDetails().addAll(detailList);
         }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -32,6 +32,7 @@ import com.uas.platform.b2b.model.util.ApCheckAllCountSqls;
 import com.uas.platform.b2b.model.util.ApCheckDoneCountSqls;
 import com.uas.platform.b2b.model.util.ApCheckTodoCountSqls;
 import com.uas.platform.b2b.publicapi.model.ApCheckAmount;
+import com.uas.platform.b2b.publicapi.model.ApCheckAmountDetail;
 import com.uas.platform.b2b.service.ErpProdIODetailService;
 import com.uas.platform.b2b.service.OrderRedDotService;
 import com.uas.platform.b2b.service.PurchaseApCheckService;
@@ -75,6 +76,7 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -687,9 +689,45 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
                 List<ApCheckAmount> thisMonthDoneTrades = getThisMonthDoneTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
                 customer.setThisMonthDoneCount(thisMonthDoneTrades);
             }
+            setAmountDetail(customer);
         }
     }
 
+    /**
+     * 设置对账明细数据
+     *
+     * @param customer 供应商客户信息
+     */
+    private void setAmountDetail(Vendor customer) {
+        // 先统计总额币别
+        Set<String> currencySet = customer.getTotalCount()
+            .parallelStream().map(ApCheckAmount::getCurrency)
+            .collect(Collectors.toSet());
+        List<ApCheckAmountDetail> detailList = new ArrayList<>();
+        currencySet.forEach(currency -> {
+            List<String> totalAmount = customer.getTotalCount().stream()
+                .filter(count -> currency.equals(count.getCurrency()))
+                .map(ApCheckAmount::getAmount).collect(Collectors.toList());
+            List<String> thisPeriodAmount = customer.getThisMonthCount().stream()
+                .filter(count -> currency.equals(count.getCurrency()))
+                .map(ApCheckAmount::getAmount).collect(Collectors.toList());
+            List<String> thisPeriodTodoAmount = customer.getThisMonthTodoCount().stream()
+                .filter(count -> currency.equals(count.getCurrency()))
+                .map(ApCheckAmount::getAmount).collect(Collectors.toList());
+            List<String> thisPeriodDoneAmount = customer.getThisMonthDoneCount().stream()
+                .filter(count -> currency.equals(count.getCurrency()))
+                .map(ApCheckAmount::getAmount).collect(Collectors.toList());
+            ApCheckAmountDetail detail = new ApCheckAmountDetail();
+            detail.setCurrency(currency);
+            detail.setThisPeriodAmount(thisPeriodAmount.size() > 0 ? thisPeriodAmount.get(0) : null);
+            detail.setTotalAmount(totalAmount.size() > 0 ? totalAmount.get(0) : null);
+            detail.setThisPeriodTodoAmount(thisPeriodTodoAmount.size() > 0 ? thisPeriodTodoAmount.get(0) : null);
+            detail.setThisPeriodDoneAmount(thisPeriodDoneAmount.size() > 0 ? thisPeriodDoneAmount.get(0) : null);
+            detailList.add(detail);
+        });
+        customer.setAmountDetailList(detailList);
+    }
+
     /**
      * 设置供应商信息
      * @param params 分页参数
@@ -801,21 +839,14 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
     public List<ApCheckAmount> groupCountByCurrency(List<ApCheckAmount> totalTrades) {
         List<ApCheckAmount> resultCounts = new ArrayList<>();
         if (null != totalTrades && !CollectionUtils.isEmpty(totalTrades)) {
-            Double rmbCount = totalTrades.stream().filter(tradeCount -> null != tradeCount && RMB.equals(tradeCount.getCurrency()))
-                .mapToDouble(ApCheckAmount::getCount).sum();
-            Double usdCount = totalTrades.stream().filter(tradeCount -> null != tradeCount && USD.equals(tradeCount.getCurrency()))
-                .mapToDouble(ApCheckAmount::getCount).sum();
-            Double hkdCount = totalTrades.stream().filter(tradeCount -> null != tradeCount && HKD.equals(tradeCount.getCurrency()))
-                .mapToDouble(ApCheckAmount::getCount).sum();
-            if (rmbCount > 0) {
-                resultCounts.add(new ApCheckAmount(RMB, DecimalUtils.decimalPoint(rmbCount, 2)));
-            }
-            if (usdCount > 0) {
-                resultCounts.add(new ApCheckAmount(USD, DecimalUtils.decimalPoint(usdCount, 2)));
-            }
-            if (hkdCount > 0) {
-                resultCounts.add(new ApCheckAmount(HKD, DecimalUtils.decimalPoint(hkdCount, 2)));
-            }
+            Set<String> currencySet = totalTrades.parallelStream().map(ApCheckAmount::getCurrency).collect(Collectors.toSet());
+            currencySet.forEach(currency -> {
+                Double amount = totalTrades.stream().filter(tradeCount -> null != tradeCount && currency.equals(tradeCount.getCurrency()))
+                    .mapToDouble(ApCheckAmount::getCount).sum();
+                if (amount > 0) {
+                    resultCounts.add(new ApCheckAmount(currency, DecimalUtils.decimalPoint(amount, 2)));
+                }
+            });
         }
         return resultCounts;
     }