master
jiangyunjie 6 years ago
parent 9d939e1c43
commit 25b42d4f57

@ -445,11 +445,11 @@ public class CustomerService {
List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, null, earlyDate, type); List<FriendDTO> earlyList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, null, earlyDate, type);
results.put("early", earlyList); results.put("early", earlyList);
} else { } 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); 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); 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); results.put("early", earlyList);
} }
return results; return results;

@ -18,14 +18,14 @@ public interface OpSellerCustomerRelationDOMapper extends BaseMapper<OpSellerCus
/** /**
* *
* @param sellerId * @param userId
* @param search * @param search
* @param startDate * @param startDate
* @param endDate * @param endDate
* @param type * @param type
* @return * @return
*/ */
List<FriendDTO> selectFriendListBySeller(@Param("sellerId") Long sellerId, List<FriendDTO> selectFriendListBySeller(@Param("userId") Long userId,
@Param("search") String search, @Param("search") String search,
@Param("startDate") Date startDate, @Param("startDate") Date startDate,
@Param("endDate") Date endDate, @Param("endDate") Date endDate,

@ -28,8 +28,8 @@
<if test="type == 2"> <if test="type == 2">
and t3.id is null and t3.id is null
</if> </if>
<if test="sellerId != null and sellerId != 0"> <if test="userId != null">
and t4.user_id = #{sellerId} and t5.id = #{userId}
</if> </if>
<if test="search != null and search !=''"> <if test="search != null and search !=''">
and and

Loading…
Cancel
Save