From f5330be2103f426e8e68c05bbe0b1e413c80b039 Mon Sep 17 00:00:00 2001
From: jiangyunjie <woainiduoduo999@163.com>
Date: Sun, 26 Apr 2020 16:49:23 +0800
Subject: [PATCH] app

---
 .../mapper/StorePromotionDataDOMapper.java    |  4 +-
 .../service/StorePromotionDataService.java    | 10 +--
 .../OpSellerCustomerRelationDOMapper.xml      |  1 +
 .../mapper/StorePromotionDataDOMapper.xml     | 68 +++++++++++--------
 4 files changed, 50 insertions(+), 33 deletions(-)

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 e3ddf78..97a35be 100644
--- a/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/store/mapper/StorePromotionDataDOMapper.java
@@ -187,8 +187,10 @@ public interface StorePromotionDataDOMapper {
      * 查询店铺排名
      * @param startDate
      * @param endDate
+     * @param storeId
      * @return
      */
     List<StorePromotionDataDO> selectStaffRankNo(@Param("startDate") Date startDate,
-                                                 @Param("endDate") Date endDate);
+                                                 @Param("endDate") Date endDate,
+                                                 @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 2151987..eabd26d 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
@@ -315,13 +315,13 @@ public class StorePromotionDataService {
         Integer newCusNumLast = null;
         Integer rankNo = null;
         Integer differFromChampion = null;
+        Long storeId = storePromotionDataDOMapper.selectStoreIdByUserId(userId);
+        if (storeId == null) {
+            return storePromotionDataDO;
+        }
         switch (roleCode) {
             // 店长
             case Constants.WX_USER_ROLE_SHOP_MANAGER:
-                Long storeId = storePromotionDataDOMapper.selectStoreIdByUserId(userId);
-                if (storeId == null) {
-                    break;
-                }
                 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);
@@ -367,7 +367,7 @@ public class StorePromotionDataService {
                 newCusNum = storePromotionDataDOMapper.selectWxSumCusNumByCondition(userId, null, startDate, endDate, null);
                 newCusNumLast = storePromotionDataDOMapper.selectWxSumCusNumByCondition(userId, null, lastStartDate, lastEndDate, null);
                 // 店铺排名
-                List<StorePromotionDataDO> staffRankNoList = storePromotionDataDOMapper.selectStaffRankNo(startDate, endDate);
+                List<StorePromotionDataDO> staffRankNoList = storePromotionDataDOMapper.selectStaffRankNo(startDate, endDate, storeId);
                 if (CollectionUtils.isNotEmpty(staffRankNoList)) {
                     for (int i = 0; i < staffRankNoList.size(); i++) {
                         if (staffRankNoList.get(i).getUserId().equals(userId.toString())) {
diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
index 7308155..b7ae0c0 100644
--- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
+++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
@@ -49,6 +49,7 @@
         <if test="endDate != null">
             and DATE_FORMAT(t1.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
         </if>
+        order by t1.create_time desc
     </select>
     <select id="selectAllCustomer" resultType="java.util.Map">
         select user_id,count(0) as count  from op_seller_customer_relation
diff --git a/src/main/resources/mapper/StorePromotionDataDOMapper.xml b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
index 4a078be..e816bfa 100644
--- a/src/main/resources/mapper/StorePromotionDataDOMapper.xml
+++ b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
@@ -316,7 +316,7 @@
     </select>
 
     <select id="selectStoreIdByUserId" resultType="java.lang.Long">
-        SELECT store_id FROM poi_store_staff WHERE user_id = #{userId} and type = 1 and status = 1 and deleted = 0
+        SELECT store_id FROM poi_store_staff WHERE user_id = #{userId} and status = 1 and deleted = 0
     </select>
 
     <select id="selectWxStaffDOList" resultType="com.kiisoo.ic.store.entity.StaffDO">
@@ -354,37 +354,51 @@
     </select>
     <select id="selectStoreRankNo" resultType="com.kiisoo.ic.store.entity.StorePromotionDataDO">
         SELECT
-            a.storeId,
-            a.newCusNum,
-            @rank := @rank + 1 AS rankNo
+        a.storeId,
+        a.newCusNum,
+        @rank := @rank + 1 AS rankNo
         FROM
-            ( SELECT count( customer_id ) AS newCusNum, store_id AS storeId FROM
-             `op_seller_customer_relation`
-            <if test="startDate != null">
-                WHERE DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
-            </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
-            </if>
-              GROUP BY store_id ORDER BY newCusNum DESC ) a,
-            ( SELECT @rank := 0 ) b
+        (
+        SELECT
+        count( t2.customer_id ) AS newCusNum,
+        t1.id AS storeId
+        FROM
+        poi_store t1
+        LEFT JOIN `op_seller_customer_relation` t2 ON t1.id = t2.store_id
+        <if test="startDate != null">
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
+        </if>
+        <if test="endDate != null">
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
+        </if>
+        WHERE
+        t1.STATUS = 1
+        GROUP BY
+        storeId
+        ORDER BY
+        newCusNum DESC
+        ) a,
+        ( SELECT @rank := 0 ) b
     </select>
     <select id="selectStaffRankNo" resultType="com.kiisoo.ic.store.entity.StorePromotionDataDO">
         SELECT
-            a.userId,
-            a.newCusNum,
-            @rank := @rank + 1 AS rankNo
+        a.userId,
+        a.newCusNum,
+        @rank := @rank + 1 AS rankNo
         FROM
-            ( SELECT count( customer_id ) AS newCusNum, user_id AS userId FROM
-             `op_seller_customer_relation`
-            <if test="startDate != null">
-                WHERE DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
-            </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
-            </if>
-              GROUP BY user_id ORDER BY newCusNum DESC ) a,
-            ( SELECT @rank := 0 ) b
+        ( SELECT count( t2.customer_id ) AS newCusNum, t1.user_id AS userId FROM
+        poi_store_staff t1
+        LEFT JOIN `op_seller_customer_relation` t2 ON t1.user_id = t2.user_id
+        <if test="startDate != null">
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
+        </if>
+        <if test="endDate != null">
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
+        </if>
+        where t1.store_id = #{storeId}
+        and t1.type = 4
+        GROUP BY userId ORDER BY newCusNum DESC ) a,
+        ( SELECT @rank := 0 ) b
     </select>