客户管理
parent
997b71bc55
commit
089c6c2c2c
|
|
@ -12,28 +12,35 @@ import com.njzscloud.common.core.ex.Exceptions;
|
||||||
import com.njzscloud.common.core.utils.GroupUtil;
|
import com.njzscloud.common.core.utils.GroupUtil;
|
||||||
import com.njzscloud.common.mp.support.PageParam;
|
import com.njzscloud.common.mp.support.PageParam;
|
||||||
import com.njzscloud.common.mp.support.PageResult;
|
import com.njzscloud.common.mp.support.PageResult;
|
||||||
|
import com.njzscloud.common.security.support.UserDetail;
|
||||||
|
import com.njzscloud.common.security.util.SecurityUtil;
|
||||||
import com.njzscloud.supervisory.biz.constant.AuditStatus;
|
import com.njzscloud.supervisory.biz.constant.AuditStatus;
|
||||||
import com.njzscloud.supervisory.biz.constant.BizObj;
|
import com.njzscloud.supervisory.biz.constant.BizObj;
|
||||||
|
import com.njzscloud.supervisory.biz.pojo.entity.BizAuditConfigEntity;
|
||||||
|
import com.njzscloud.supervisory.biz.service.BizAuditConfigService;
|
||||||
import com.njzscloud.supervisory.customer.mapper.CustomerMapper;
|
import com.njzscloud.supervisory.customer.mapper.CustomerMapper;
|
||||||
import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam;
|
import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam;
|
||||||
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
|
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
|
||||||
import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
|
import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
|
||||||
|
import com.njzscloud.supervisory.order.contant.OrderStatus;
|
||||||
import com.njzscloud.supervisory.sys.user.service.UserRoleService;
|
import com.njzscloud.supervisory.sys.user.service.UserRoleService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.*;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
import static com.njzscloud.supervisory.constant.Constant.ROLE_JG;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class CustomerService {
|
public class CustomerService {
|
||||||
private final CustomerMapper customerMapper;
|
private final CustomerMapper customerMapper;
|
||||||
private final UserRoleService userRoleService;
|
private final UserRoleService userRoleService;
|
||||||
|
private final BizAuditConfigService bizAuditConfigService;
|
||||||
|
|
||||||
public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
|
public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
|
||||||
Page<SearchCustomerResult> page = pageParam.toPage();
|
Page<SearchCustomerResult> page = pageParam.toPage();
|
||||||
|
|
@ -80,6 +87,17 @@ public class CustomerService {
|
||||||
BizObj.GeTi).map(BizObj::getVal).collect(Collectors.toList()))
|
BizObj.GeTi).map(BizObj::getVal).collect(Collectors.toList()))
|
||||||
.and(it -> it.eq("c.audit_status", AuditStatus.TongGuo).or().isNull("c.audit_status"));
|
.and(it -> it.eq("c.audit_status", AuditStatus.TongGuo).or().isNull("c.audit_status"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UserDetail userDetail = SecurityUtil.loginUser();
|
||||||
|
Set<String> roles = userDetail.getRoles();
|
||||||
|
if (CollUtil.isNotEmpty(roles) && roles.contains(ROLE_JG)) {
|
||||||
|
List<String> areaList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles))
|
||||||
|
.stream().map(BizAuditConfigEntity::getArea).distinct().collect(Collectors.toList());
|
||||||
|
List<String> cityList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles))
|
||||||
|
.stream().map(BizAuditConfigEntity::getArea).distinct().collect(Collectors.toList());
|
||||||
|
List<String> list = mergeLists(areaList, cityList);
|
||||||
|
ew.in(CollUtil.isNotEmpty(list), "c.area", list);
|
||||||
|
}
|
||||||
IPage<SearchCustomerResult> paging = customerMapper.paging(page, ew);
|
IPage<SearchCustomerResult> paging = customerMapper.paging(page, ew);
|
||||||
List<SearchCustomerResult> records = paging.getRecords();
|
List<SearchCustomerResult> records = paging.getRecords();
|
||||||
if (CollUtil.isEmpty(records)) return PageResult.of(paging);
|
if (CollUtil.isEmpty(records)) return PageResult.of(paging);
|
||||||
|
|
@ -94,6 +112,12 @@ public class CustomerService {
|
||||||
return PageResult.of(paging);
|
return PageResult.of(paging);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<String> mergeLists(List<String> list1, List<String> list2) {
|
||||||
|
Set<String> set = new HashSet<>(list1);
|
||||||
|
set.addAll(list2);
|
||||||
|
return new ArrayList<>(set);
|
||||||
|
}
|
||||||
|
|
||||||
public void shortBarge(Boolean enable, Long customerId) {
|
public void shortBarge(Boolean enable, Long customerId) {
|
||||||
userRoleService.shortBarge(enable, customerId);
|
userRoleService.shortBarge(enable, customerId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue