From 93b6c5de786ca29c7d0c5d81aa4183cb240c8bf2 Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Tue, 28 Apr 2020 21:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=B9=81=E9=87=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/customer/entity/CustomerViewVO.java    |  4 +--
 .../customer/entity/OpCustomerSimpleVO.java   | 31 +++++++++++++++++++
 .../customer/service/CustomerViewService.java |  6 ++--
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/kiisoo/ic/customer/entity/OpCustomerSimpleVO.java

diff --git a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java
index c5ba9ea..acde79d 100644
--- a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java
+++ b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java
@@ -28,9 +28,9 @@ public class CustomerViewVO {
     private Long allVipCount;
 
     /**好友list*/
-    List<OpCustomer> customerList;
+    List<OpCustomerSimpleVO> customerList;
     /**好友(去重)list*/
-    List<OpCustomer> validCustomerList;
+    List<OpCustomerSimpleVO> validCustomerList;
 
     /**零售公司新增top10*/
     List<CustomerViewCompanyVO> orgNewCustomerList;
diff --git a/src/main/java/com/kiisoo/ic/customer/entity/OpCustomerSimpleVO.java b/src/main/java/com/kiisoo/ic/customer/entity/OpCustomerSimpleVO.java
new file mode 100644
index 0000000..3faaec4
--- /dev/null
+++ b/src/main/java/com/kiisoo/ic/customer/entity/OpCustomerSimpleVO.java
@@ -0,0 +1,31 @@
+package com.kiisoo.ic.customer.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description:  客户表简单VO
+ * @Author:  wangyinjia
+ * @Date: 2020-04-28
+ */
+@Data
+public class OpCustomerSimpleVO {
+	/**
+	 * 主键ID
+	 */
+	private Long id;
+
+	/**
+	 * 注册时间
+	 */
+	private Date registerTime;
+
+	/**
+	 * 初始化
+	 */
+	public OpCustomerSimpleVO(Long id, Date registerTime){
+		this.id = id;
+		this.registerTime = registerTime;
+	}
+}
diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index 719adc3..09ccf20 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -116,8 +116,10 @@ public class CustomerViewService {
 
         //设置柱状图list
         List<OpCustomer> validCustomerList = customerList.stream().filter(customerDO -> VALID.equals(customerDO.getValidType())).collect(Collectors.toList());
-        customerViewVO.setCustomerList(customerList);
-        customerViewVO.setValidCustomerList(validCustomerList);
+        List<OpCustomerSimpleVO> simpleCustomerList = customerList.stream().map(customer -> new OpCustomerSimpleVO(customer.getId(), customer.getRegisterTime())).collect(Collectors.toList());
+        List<OpCustomerSimpleVO> simpleValidCustomerList = customerList.stream().filter(customerDO -> VALID.equals(customerDO.getValidType())).map(customer -> new OpCustomerSimpleVO(customer.getId(), customer.getRegisterTime())).collect(Collectors.toList());
+        customerViewVO.setCustomerList(simpleCustomerList);
+        customerViewVO.setValidCustomerList(simpleValidCustomerList);
         //设置新增好友，好友总数，拉黑数，vip人数，柱状图list等数据
         setCustomerViewData(customerViewVO, customerCount, validCustomerCount, validDeleteCustomerCount, vipCount, customerList, validCustomerList, selectStartTime, selectEndTime);
         //前十名排行list等