|
|
@ -7,8 +7,8 @@ import com.kiisoo.ic.constants.Constants;
|
|
|
|
import com.kiisoo.ic.customer.bean.CustomerDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.CustomerDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.CustomerModifyDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.CustomerModifyDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.FriendDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.FriendDTO;
|
|
|
|
import com.kiisoo.ic.customer.entity.OpCustomer;
|
|
|
|
|
|
|
|
import com.kiisoo.ic.customer.bean.OpCustomerDTO;
|
|
|
|
import com.kiisoo.ic.customer.bean.OpCustomerDTO;
|
|
|
|
|
|
|
|
import com.kiisoo.ic.customer.entity.OpCustomer;
|
|
|
|
import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
|
|
|
|
import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
|
|
|
|
import com.kiisoo.ic.customer.entity.OpVip;
|
|
|
|
import com.kiisoo.ic.customer.entity.OpVip;
|
|
|
|
import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper;
|
|
|
|
import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper;
|
|
|
@ -17,18 +17,16 @@ import com.kiisoo.ic.customer.mapper.OpVipDOMapper;
|
|
|
|
import com.kiisoo.ic.domain.service.PrivilageDomainService;
|
|
|
|
import com.kiisoo.ic.domain.service.PrivilageDomainService;
|
|
|
|
import com.kiisoo.ic.generalize.service.RetailCompanyService;
|
|
|
|
import com.kiisoo.ic.generalize.service.RetailCompanyService;
|
|
|
|
import com.kiisoo.ic.store.entity.PoiStore;
|
|
|
|
import com.kiisoo.ic.store.entity.PoiStore;
|
|
|
|
import com.kiisoo.ic.store.service.PoiStoreService;
|
|
|
|
|
|
|
|
import com.kiisoo.ic.store.entity.PoiStoreStaff;
|
|
|
|
import com.kiisoo.ic.store.entity.PoiStoreStaff;
|
|
|
|
import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
|
|
|
|
import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
|
|
|
|
import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
|
|
|
|
import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
|
|
|
|
|
|
|
|
import com.kiisoo.ic.store.service.PoiStoreService;
|
|
|
|
import com.kiisoo.ic.system.enums.RoleEnum;
|
|
|
|
import com.kiisoo.ic.system.enums.RoleEnum;
|
|
|
|
import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
|
|
|
|
import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
|
|
|
|
import org.apache.commons.lang.time.DateUtils;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
@ -258,7 +256,7 @@ public class CustomerService {
|
|
|
|
public Map<String,Object> listCustomer(Long userId,Long sellerId,String search,String roleCode){
|
|
|
|
public Map<String,Object> listCustomer(Long userId,Long sellerId,String search,String roleCode){
|
|
|
|
Map<String,Object> results = new HashMap<>();
|
|
|
|
Map<String,Object> results = new HashMap<>();
|
|
|
|
Date thisDate = new Date();
|
|
|
|
Date thisDate = new Date();
|
|
|
|
Date lastDate = DateUtils.addDays(thisDate, -1);
|
|
|
|
Date lastDate = new Date();
|
|
|
|
if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())){
|
|
|
|
if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())){
|
|
|
|
List<StafferInfoVO> stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId);
|
|
|
|
List<StafferInfoVO> stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId);
|
|
|
|
Long shopId = stafferInfoVOS.get(0).getStoreId();
|
|
|
|
Long shopId = stafferInfoVOS.get(0).getStoreId();
|
|
|
|