From ca48dac3c876ab3edf2fc37590afed51ad366a7e Mon Sep 17 00:00:00 2001
From: jiangyunjie <woainiduoduo999@163.com>
Date: Sun, 26 Apr 2020 20:04:33 +0800
Subject: [PATCH] app

---
 .../com/kiisoo/ic/store/constant/Constants.java    |  5 +++++
 .../ic/store/entity/StorePromotionDataDO.java      |  5 +++++
 .../store/mapper/StorePromotionDataDOMapper.java   |  7 +++++++
 .../store/service/StorePromotionDataService.java   | 14 +++++++++++---
 .../mapper/OpSellerCustomerRelationDOMapper.xml    |  1 +
 .../mapper/StorePromotionDataDOMapper.xml          |  4 ++++
 6 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/store/constant/Constants.java b/src/main/java/com/kiisoo/ic/store/constant/Constants.java
index 9d2bae3..bc5b1e0 100644
--- a/src/main/java/com/kiisoo/ic/store/constant/Constants.java
+++ b/src/main/java/com/kiisoo/ic/store/constant/Constants.java
@@ -84,4 +84,9 @@ public class Constants {
      * 波司登请求导购二维码type
      */
     public static final String BSD_REQ_QRCODE_TYPE_SELLER = "1";
+
+    /**
+     * 好友数0
+     */
+    public static final Integer CUS_NUM_ZERO = 0;
 }
diff --git a/src/main/java/com/kiisoo/ic/store/entity/StorePromotionDataDO.java b/src/main/java/com/kiisoo/ic/store/entity/StorePromotionDataDO.java
index b64259d..107c188 100644
--- a/src/main/java/com/kiisoo/ic/store/entity/StorePromotionDataDO.java
+++ b/src/main/java/com/kiisoo/ic/store/entity/StorePromotionDataDO.java
@@ -124,4 +124,9 @@ public class StorePromotionDataDO {
      * 和第一名差距
      */
     private Integer differFromChampion;
+
+    /**
+     * 最近更新时间
+     */
+    private Date latestUpdate;
 }
diff --git a/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java
index 97a35be..8270555 100644
--- a/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java
@@ -193,4 +193,11 @@ public interface StorePromotionDataDOMapper {
     List<StorePromotionDataDO> selectStaffRankNo(@Param("startDate") Date startDate,
                                                  @Param("endDate") Date endDate,
                                                  @Param("storeId") Long storeId);
+
+    /**
+     * 导购数据最近更新时间
+     * @param storeId
+     * @return
+     */
+    Date selectLatestUpdateTime(@Param("storeId") Long storeId);
 }
diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
index eabd26d..f7db26d 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
@@ -322,9 +322,9 @@ public class StorePromotionDataService {
         switch (roleCode) {
             // 店长
             case Constants.WX_USER_ROLE_SHOP_MANAGER:
-                cusNum = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, null, null, Constants.STORE_SELLER_CUS_RELATION_TYPE_VALID);
-                newCusNum = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, startDate, endDate, Constants.STORE_SELLER_CUS_RELATION_TYPE_VALID);
-                newCusNumLast = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, lastStartDate, lastEndDate, Constants.STORE_SELLER_CUS_RELATION_TYPE_VALID);
+                cusNum = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, null, null, null);
+                newCusNum = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, startDate, endDate, null);
+                newCusNumLast = storePromotionDataDOMapper.selectWxSumCusNumByCondition(null, storeId, lastStartDate, lastEndDate, null);
                 // 店铺排名
                 List<StorePromotionDataDO> storeRankNoList = storePromotionDataDOMapper.selectStoreRankNo(startDate, endDate);
                 if (CollectionUtils.isNotEmpty(storeRankNoList)) {
@@ -350,9 +350,13 @@ public class StorePromotionDataService {
                     Long id = storeDO.getId();
                     if (null != staffCusNumMap && staffCusNumMap.get(id) != null) {
                         storeDO.setCusNum(staffCusNumMap.get(id));
+                    } else {
+                        storeDO.setCusNum(Constants.CUS_NUM_ZERO);
                     }
                     if (null != staffNewCusNumMap && staffNewCusNumMap.get(id) != null) {
                         storeDO.setNewCusNum(staffNewCusNumMap.get(id));
+                    } else {
+                        storeDO.setNewCusNum(Constants.CUS_NUM_ZERO);
                     }
                 });
                 if (CollectionUtils.isNotEmpty(staffDOList)) {
@@ -379,6 +383,10 @@ public class StorePromotionDataService {
                         }
                     }
                 }
+                Date latestUpdate = storePromotionDataDOMapper.selectLatestUpdateTime(storeId);
+                if (null != latestUpdate) {
+                    storePromotionDataDO.setLatestUpdate(latestUpdate);
+                }
                 break;
             default:
                 break;
diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
index b7ae0c0..1debfbe 100644
--- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
+++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper">
     <select id="selectShopListByDate" resultType="com.kiisoo.ic.customer.bean.FriendDTO">
         SELECT
+        DISTINCT
         t2.NAME AS customerName,
         t2.id AS customerId,
         t2.phone AS mobile,
diff --git a/src/main/resources/mapper/StorePromotionDataDOMapper.xml b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
index e816bfa..16d3767 100644
--- a/src/main/resources/mapper/StorePromotionDataDOMapper.xml
+++ b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
@@ -400,6 +400,10 @@
         GROUP BY userId ORDER BY newCusNum DESC ) a,
         ( SELECT @rank := 0 ) b
     </select>
+    <select id="selectLatestUpdateTime" resultType="java.util.Date">
+        select max(create_time) from op_seller_customer_relation where store_id = #{storeId}
+        order by create_time desc
+    </select>
 
 
 </mapper>