This commit is contained in:
@@ -52,6 +52,7 @@ public class OrderController {
|
|||||||
@GetMapping
|
@GetMapping
|
||||||
public Result<Page<Order>> getOrders(
|
public Result<Page<Order>> getOrders(
|
||||||
@RequestParam(required = false) String customerId,
|
@RequestParam(required = false) String customerId,
|
||||||
|
@RequestParam(required = false) String customerName,
|
||||||
@RequestParam(required = false) Integer status,
|
@RequestParam(required = false) Integer status,
|
||||||
@RequestParam(required = false) String startDate,
|
@RequestParam(required = false) String startDate,
|
||||||
@RequestParam(required = false) String endDate,
|
@RequestParam(required = false) String endDate,
|
||||||
@@ -64,7 +65,7 @@ public class OrderController {
|
|||||||
startDate = systemConfigService.getCustomerOrderStartDate().toString();
|
startDate = systemConfigService.getCustomerOrderStartDate().toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.success(orderService.getOrders(customerId, status, startDate, endDate, page, pageSize));
|
return Result.success(orderService.getOrders(customerId, customerName, status, startDate, endDate, page, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,12 +163,15 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
* 获取订单列表
|
* 获取订单列表
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Page<Order> getOrders(String customerId, Integer status, String startDate, String endDate, Integer page, Integer pageSize) {
|
public Page<Order> getOrders(String customerId, String customerName, Integer status, String startDate, String endDate, Integer page, Integer pageSize) {
|
||||||
Page<Order> pageParam = new Page<>(page, pageSize);
|
Page<Order> pageParam = new Page<>(page, pageSize);
|
||||||
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
|
||||||
if (customerId != null) {
|
if (customerId != null) {
|
||||||
wrapper.eq(Order::getCustomerId, customerId);
|
wrapper.eq(Order::getCustomerId, customerId);
|
||||||
}
|
}
|
||||||
|
if (customerName != null && !customerName.isEmpty()) {
|
||||||
|
wrapper.like(Order::getCustomerName, customerName);
|
||||||
|
}
|
||||||
if (status != null) {
|
if (status != null) {
|
||||||
wrapper.eq(Order::getStatus, status);
|
wrapper.eq(Order::getStatus, status);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user