From 02383f1f3a94117228b403162db50a46420c75e7 Mon Sep 17 00:00:00 2001 From: Agent Date: Sun, 29 Mar 2026 05:44:36 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E6=94=AF=E6=8C=81typ?= =?UTF-8?q?e=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8C=89=E7=A7=8D=E7=B1=BB?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/building/controller/CustomerController.java | 3 ++- src/main/java/com/example/building/entity/Customer.java | 5 +++++ .../java/com/example/building/service/CustomerService.java | 2 +- .../example/building/service/impl/CustomerServiceImpl.java | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/building/controller/CustomerController.java b/src/main/java/com/example/building/controller/CustomerController.java index a14d9e6..f4dd6cf 100644 --- a/src/main/java/com/example/building/controller/CustomerController.java +++ b/src/main/java/com/example/building/controller/CustomerController.java @@ -23,9 +23,10 @@ public class CustomerController { @GetMapping public Result> getCustomers( @RequestParam(required = false) String keyword, + @RequestParam(required = false) String type, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "20") Integer pageSize) { - return Result.success(customerService.getCustomers(keyword, page, pageSize)); + return Result.success(customerService.getCustomers(keyword, type, page, pageSize)); } /** diff --git a/src/main/java/com/example/building/entity/Customer.java b/src/main/java/com/example/building/entity/Customer.java index 07a1f09..3670eb7 100644 --- a/src/main/java/com/example/building/entity/Customer.java +++ b/src/main/java/com/example/building/entity/Customer.java @@ -51,6 +51,11 @@ public class Customer { */ private String remark; + /** + * 客户种类: customer=顾客, carpenter=木匠, company=装修公司 + */ + private String type; + /** * 累计消费金额 */ diff --git a/src/main/java/com/example/building/service/CustomerService.java b/src/main/java/com/example/building/service/CustomerService.java index 4641d20..9fe5e65 100644 --- a/src/main/java/com/example/building/service/CustomerService.java +++ b/src/main/java/com/example/building/service/CustomerService.java @@ -11,7 +11,7 @@ public interface CustomerService { /** * 客户列表 */ - Page getCustomers(String keyword, Integer page, Integer pageSize); + Page getCustomers(String keyword, String type, Integer page, Integer pageSize); /** * 客户详情 diff --git a/src/main/java/com/example/building/service/impl/CustomerServiceImpl.java b/src/main/java/com/example/building/service/impl/CustomerServiceImpl.java index 7f24301..528384a 100644 --- a/src/main/java/com/example/building/service/impl/CustomerServiceImpl.java +++ b/src/main/java/com/example/building/service/impl/CustomerServiceImpl.java @@ -25,7 +25,7 @@ public class CustomerServiceImpl implements CustomerService { * 客户列表 */ @Override - public Page getCustomers(String keyword, Integer page, Integer pageSize) { + public Page getCustomers(String keyword, String type, Integer page, Integer pageSize) { Page pageParam = new Page<>(page, pageSize); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (StringUtils.hasText(keyword)) { @@ -33,7 +33,9 @@ public class CustomerServiceImpl implements CustomerService { .or() .like(Customer::getPhone, keyword); } - wrapper.orderByDesc(Customer::getLastLoginAt); + if (StringUtils.hasText(type)) { + wrapper.eq(Customer::getType, type); + } wrapper.orderByDesc(Customer::getLastLoginAt); wrapper.orderByDesc(Customer::getCreatedAt); return customerMapper.selectPage(pageParam, wrapper);