feat: 客户支持type字段,按种类过滤
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -23,9 +23,10 @@ public class CustomerController {
|
|||||||
@GetMapping
|
@GetMapping
|
||||||
public Result<Page<Customer>> getCustomers(
|
public Result<Page<Customer>> getCustomers(
|
||||||
@RequestParam(required = false) String keyword,
|
@RequestParam(required = false) String keyword,
|
||||||
|
@RequestParam(required = false) String type,
|
||||||
@RequestParam(defaultValue = "1") Integer page,
|
@RequestParam(defaultValue = "1") Integer page,
|
||||||
@RequestParam(defaultValue = "20") Integer pageSize) {
|
@RequestParam(defaultValue = "20") Integer pageSize) {
|
||||||
return Result.success(customerService.getCustomers(keyword, page, pageSize));
|
return Result.success(customerService.getCustomers(keyword, type, page, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -51,6 +51,11 @@ public class Customer {
|
|||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 客户种类: customer=顾客, carpenter=木匠, company=装修公司
|
||||||
|
*/
|
||||||
|
private String type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 累计消费金额
|
* 累计消费金额
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ public interface CustomerService {
|
|||||||
/**
|
/**
|
||||||
* 客户列表
|
* 客户列表
|
||||||
*/
|
*/
|
||||||
Page<Customer> getCustomers(String keyword, Integer page, Integer pageSize);
|
Page<Customer> getCustomers(String keyword, String type, Integer page, Integer pageSize);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 客户详情
|
* 客户详情
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|||||||
* 客户列表
|
* 客户列表
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Page<Customer> getCustomers(String keyword, Integer page, Integer pageSize) {
|
public Page<Customer> getCustomers(String keyword, String type, Integer page, Integer pageSize) {
|
||||||
Page<Customer> pageParam = new Page<>(page, pageSize);
|
Page<Customer> pageParam = new Page<>(page, pageSize);
|
||||||
LambdaQueryWrapper<Customer> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<Customer> wrapper = new LambdaQueryWrapper<>();
|
||||||
if (StringUtils.hasText(keyword)) {
|
if (StringUtils.hasText(keyword)) {
|
||||||
@@ -33,7 +33,9 @@ public class CustomerServiceImpl implements CustomerService {
|
|||||||
.or()
|
.or()
|
||||||
.like(Customer::getPhone, keyword);
|
.like(Customer::getPhone, keyword);
|
||||||
}
|
}
|
||||||
wrapper.orderByDesc(Customer::getLastLoginAt);
|
if (StringUtils.hasText(type)) {
|
||||||
|
wrapper.eq(Customer::getType, type);
|
||||||
|
}
|
||||||
wrapper.orderByDesc(Customer::getLastLoginAt);
|
wrapper.orderByDesc(Customer::getLastLoginAt);
|
||||||
wrapper.orderByDesc(Customer::getCreatedAt);
|
wrapper.orderByDesc(Customer::getCreatedAt);
|
||||||
return customerMapper.selectPage(pageParam, wrapper);
|
return customerMapper.selectPage(pageParam, wrapper);
|
||||||
|
|||||||
Reference in New Issue
Block a user