From 25b42d4f57f0f188d85df464ed273d274d83344d Mon Sep 17 00:00:00 2001
From: jiangyunjie <woainiduoduo999@163.com>
Date: Wed, 29 Apr 2020 17:32:39 +0800
Subject: [PATCH] bug

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java   | 6 +++---
 .../customer/mapper/OpSellerCustomerRelationDOMapper.java   | 4 ++--
 .../resources/mapper/OpSellerCustomerRelationDOMapper.xml   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 098cb45..c88ae48 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -445,11 +445,11 @@ public class CustomerService {
             List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, null, earlyDate, type);
             results.put("early", earlyList);
         } else {
-            List<FriendDTO> thisList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(sellerId, search, thisDate, thisDate, type);
+            List<FriendDTO> thisList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, thisDate, thisDate, type);
             results.put("this", thisList);
-            List<FriendDTO> lastList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(sellerId, search, lastDate, lastDate, type);
+            List<FriendDTO> lastList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, lastDate, lastDate, type);
             results.put("last", lastList);
-            List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(sellerId, search, null, earlyDate, type);
+            List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListBySeller(userId, search, null, earlyDate, type);
             results.put("early", earlyList);
         }
         return results;
diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
index a280028..07bf0cd 100644
--- a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java
@@ -18,14 +18,14 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
 
     /**
      * 查询用户
-     * @param sellerId
+     * @param userId
      * @param search
      * @param startDate
      * @param endDate
      * @param type
      * @return
      */
-    List<FriendDTO> selectFriendListBySeller(@Param("sellerId") Long sellerId,
+    List<FriendDTO> selectFriendListBySeller(@Param("userId") Long userId,
                                          @Param("search") String search,
                                          @Param("startDate") Date startDate,
                                          @Param("endDate") Date endDate,
diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
index 065b2a4..406888a 100644
--- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
+++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
@@ -28,8 +28,8 @@
         <if test="type == 2">
             and t3.id is null
         </if>
-        <if test="sellerId != null and sellerId != 0">
-            and t4.user_id = #{sellerId}
+        <if test="userId != null">
+            and t5.id = #{userId}
         </if>
         <if test="search != null and search !=''">
             and