From 2aec41eaff18992d3bf474001c81fccbfdbe73f2 Mon Sep 17 00:00:00 2001 From: jiangyunjie Date: Thu, 23 Apr 2020 11:06:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/StorePromotionDataService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 1bff631..b1b60d9 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java @@ -22,7 +22,10 @@ import org.springframework.transaction.annotation.Transactional; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -295,6 +298,9 @@ public class StorePromotionDataService { // 店长 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); @@ -330,8 +336,8 @@ public class StorePromotionDataService { }); if (CollectionUtils.isNotEmpty(staffDOList)) { // 总客户数降序 - staffDOList.stream().sorted(Comparator.comparing(StaffDO::getCusNum, Comparator.nullsLast(Integer::compareTo))).findFirst().get(); - storePromotionDataDO.setStaffDOList(staffDOList); + List staffFinalList = staffDOList.stream().sorted(Comparator.comparing(StaffDO::getCusNum, Comparator.nullsFirst(Integer::compareTo)).reversed()).collect(Collectors.toList()); + storePromotionDataDO.setStaffDOList(staffFinalList); } break; // 导购 @@ -343,7 +349,7 @@ public class StorePromotionDataService { List staffRankNoList = storePromotionDataDOMapper.selectStaffRankNo(startDate, endDate); if (CollectionUtils.isNotEmpty(staffRankNoList)) { for (int i = 0; i < staffRankNoList.size(); i++) { - if (staffRankNoList.get(i).getUserId().equals(userId)) { + if (staffRankNoList.get(i).getUserId().equals(userId.toString())) { rankNo = staffRankNoList.get(i).getRankNo(); Integer curNewCusNum = staffRankNoList.get(i).getNewCusNum(); Integer championNewCusNum = staffRankNoList.get(0).getNewCusNum();