From 1a461d29cc92e2aea7dbe69041b416a5dfc309cf Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Wed, 15 Apr 2020 15:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A6=82=E8=A7=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CustomerViewController.java    |  7 +++---
 .../ic/customer/entity/CustomerViewVO.java    | 25 ++++++++++++++++---
 .../customer/service/CustomerViewService.java | 12 +++++----
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java
index 43687b1..151d1d6 100644
--- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java
+++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java
@@ -34,19 +34,18 @@ public class CustomerViewController extends BaseController {
     /**
      * 客户概览main
      * @param userId 用户id
-     * @param regionId 区域id
+     * @param organizationId 零售公司id
      * @param shopId 店铺id
-     * @param sellerId 导购id
      * @param sevenDayStartTime 近七天开始时间
      * @param sevenDayEndTime 近七天结束时间
      * @return 客户概览VO
      */
     @ResponseBody
     @RequestMapping(value = "/main", method = RequestMethod.GET)
-    public Map<String,Object> getMainData(@RequestParam("userId")Long userId, Long regionId, Long shopId, Long sellerId,
+    public Map<String,Object> getMainData(@RequestParam("userId")Long userId, Long organizationId, Long shopId,
                                           @RequestParam("sevenDayStartTime")String sevenDayStartTime, @RequestParam("sevenDayEndTime")String sevenDayEndTime){
         try{
-            CustomerViewVO result = customerViewService.selectCustomerViewMain(userId, regionId, shopId, sellerId, sevenDayStartTime, sevenDayEndTime);
+            CustomerViewVO result = customerViewService.selectCustomerViewMain(userId, organizationId, shopId, sevenDayStartTime, sevenDayEndTime);
             return data(result);
         }catch (Exception e){
             log.error("查询客户数据概览出错", e);
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 177d109..df6f04e 100644
--- a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java
+++ b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewVO.java
@@ -14,21 +14,38 @@ import java.util.List;
  */
 @Data
 public class CustomerViewVO {
+    /**全部客户*/
+    private Long allCustomer;
+    /**有效客户*/
+    private Long validCustomer;
+    /**新增客户*/
+    private Long newCustomer;
+    /**新增有效客户*/
+    private Long newValidCustomer;
+    /**删除拉黑数*/
+    private Long deleteCustomer;
+
+    /**近七天新增客户list*/
+    List<OpCustomer> sevenDayCustomerList;
+    /**近七天新增会员list*/
+    List<OpVip> sevenDayVipList;
+
     /**未关联的客户*/
     private Long customer;
     /**已关联人数*/
     private Long common;
     /**未关联的会员*/
     private Long vip;
-    /**近七天新增客户list*/
-    List<OpCustomer> sevenDayCustomerList;
-    /**近七天新增会员list*/
-    List<OpVip> sevenDayVipList;
 
     /**
      * 初始化
      */
     public CustomerViewVO(){
+        allCustomer = 0L;
+        validCustomer = 0L;
+        newCustomer = 0L;
+        newValidCustomer = 0L;
+        deleteCustomer = 0L;
         customer = 0L;
         common = 0L;
         vip = 0L;
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 e5a78b0..77a1a4f 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -59,22 +59,24 @@ public class CustomerViewService {
     /**
      * 客户概览main
      * @param userId 用户id
-     * @param regionId 区域id
+     * @param organizationId 零售公司id
      * @param shopId 店铺id
-     * @param sellerId 导购id
      * @param sevenDayStartTime 近七天开始时间
      * @param sevenDayEndTime 近七天结束时间
      * @return 客户概览VO
      */
-    public CustomerViewVO selectCustomerViewMain(Long userId, Long regionId, Long shopId, Long sellerId, String sevenDayStartTime, String sevenDayEndTime){
+    public CustomerViewVO selectCustomerViewMain(Long userId, Long organizationId, Long shopId, String sevenDayStartTime, String sevenDayEndTime){
         CustomerViewVO customerViewVO = new CustomerViewVO();
         //shopIds
-        List<Long> shopIds = getShopIds(userId, regionId, shopId);
+//        List<Long> shopIds = getShopIds(userId, regionId, shopId);
+        List<Long> shopIds = new ArrayList<>();
         //客户list
-        List<OpCustomer> customerList = opCustomerDOMapper.selectCustomerList(shopIds, sellerId, null, null, null);
+        List<OpCustomer> customerList = opCustomerDOMapper.selectCustomerList(shopIds, null, null, null, null);
         //会员list
         List<OpVip> vipList = opVipDOMapper.selectVipList(shopIds, null, null);
 
+        //5大块客户数
+
         //设置客户，关联，vip人数
         setCustomerAndVipSize(customerList, vipList, customerViewVO);
         //近七天新增list