|
@@ -235,31 +235,31 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
private QueryWrapper webQuery(DishesOrderWebInDTO orderWebInDTO) {
|
|
private QueryWrapper webQuery(DishesOrderWebInDTO orderWebInDTO) {
|
|
|
QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<Order> orderQueryWrapper = new QueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getSn())) {
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getSn())) {
|
|
|
- orderQueryWrapper.eq("sn", orderWebInDTO.getSn());
|
|
|
|
|
|
|
+ orderQueryWrapper.eq("o.sn", orderWebInDTO.getSn());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getCustomerName())) {
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getCustomerName())) {
|
|
|
- orderQueryWrapper.eq( "customer_name", orderWebInDTO.getCustomerName());
|
|
|
|
|
|
|
+ orderQueryWrapper.eq( "o.customer_name", orderWebInDTO.getCustomerName());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getCustomerPhone())) {
|
|
if (StringUtils.isNotBlank(orderWebInDTO.getCustomerPhone())) {
|
|
|
- orderQueryWrapper.eq( "customer_phone", orderWebInDTO.getCustomerPhone());
|
|
|
|
|
|
|
+ orderQueryWrapper.eq( "o.customer_phone", orderWebInDTO.getCustomerPhone());
|
|
|
}
|
|
}
|
|
|
if (orderWebInDTO.getPayStyle() != null) {
|
|
if (orderWebInDTO.getPayStyle() != null) {
|
|
|
- orderQueryWrapper.like("pay_account", orderWebInDTO.getPayStyle());
|
|
|
|
|
|
|
+ orderQueryWrapper.like("o.pay_account", orderWebInDTO.getPayStyle());
|
|
|
}
|
|
}
|
|
|
if (orderWebInDTO.getStartDate() != null) {
|
|
if (orderWebInDTO.getStartDate() != null) {
|
|
|
- orderQueryWrapper.ge("order_time", orderWebInDTO.getStartDate());
|
|
|
|
|
|
|
+ orderQueryWrapper.ge("o.order_time", orderWebInDTO.getStartDate());
|
|
|
}
|
|
}
|
|
|
if (orderWebInDTO.getEndDate() != null) {
|
|
if (orderWebInDTO.getEndDate() != null) {
|
|
|
- orderQueryWrapper.le("order_time", orderWebInDTO.getEndDate());
|
|
|
|
|
|
|
+ orderQueryWrapper.le("o.order_time", orderWebInDTO.getEndDate());
|
|
|
}
|
|
}
|
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(orderWebInDTO.getSupplierIds())) {
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(orderWebInDTO.getSupplierIds())) {
|
|
|
- orderQueryWrapper.in("supplier_id", orderWebInDTO.getSupplierIds());
|
|
|
|
|
|
|
+ orderQueryWrapper.in("o.supplier_id", orderWebInDTO.getSupplierIds());
|
|
|
}
|
|
}
|
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(orderWebInDTO.getStationIds())) {
|
|
if (!org.springframework.util.CollectionUtils.isEmpty(orderWebInDTO.getStationIds())) {
|
|
|
- orderQueryWrapper.in("service_station_id", orderWebInDTO.getStationIds());
|
|
|
|
|
|
|
+ orderQueryWrapper.in("o.service_station_id", orderWebInDTO.getStationIds());
|
|
|
}
|
|
}
|
|
|
- orderQueryWrapper.eq("pay_status",3);
|
|
|
|
|
- orderQueryWrapper.orderByDesc("order_id");
|
|
|
|
|
|
|
+ orderQueryWrapper.eq("o.pay_status",3);
|
|
|
|
|
+ orderQueryWrapper.orderByDesc("o.order_id");
|
|
|
return orderQueryWrapper;
|
|
return orderQueryWrapper;
|
|
|
}
|
|
}
|
|
|
|
|
|