防空

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -1,11 +1,8 @@
 package com.kiisoo.ic.customer;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil;
 import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.customer.bean.CustomerDTO;
 import com.kiisoo.ic.customer.bean.CustomerModifyDTO;
@@ -29,19 +26,17 @@ import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
 import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper;
 import com.kiisoo.ic.store.service.PoiStoreService;
 import com.kiisoo.ic.synchronous.entity.TurnBackDTO;
-import com.kiisoo.ic.synchronous.entity.VipDataDTO;
 import com.kiisoo.ic.system.enums.RoleEnum;
 import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -437,6 +432,12 @@ public class CustomerService {
         calendar.set(Calendar.HOUR_OF_DAY, -24);
         Date earlyDate = dateFormat.parse(dateFormat.format(calendar.getTime()));
         List<StafferInfoVO> stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId);
+        if (CollectionUtils.isEmpty(stafferInfoVOS)) {
+            results.put("this", null);
+            results.put("last", null);
+            results.put("early", null);
+            return results;
+        }
         Long shopId = stafferInfoVOS.get(0).getStoreId();
         if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             List<FriendDTO> thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopId(shopId, sellerId, search, thisDate, thisDate, type);