优化订单列表分页与状态统计逻辑，新增 `OrderListPageVO` 用于规范返回数据格式

shaofan
1 parent 9db921f5
Showing 2 changed files with 120 additions and 31 deletions
src/main/java/com/diligrp/rider/controller/AdminRiderController.java
src/main/java/com/diligrp/rider/vo/OrderListPageVO.java
@@ -8,12 +8,15 @@ import com.diligrp.rider.entity.Rider;
 import com.diligrp.rider.mapper.OrdersMapper;
 import com.diligrp.rider.service.AdminRiderService;
 import com.diligrp.rider.vo.DeliveryOrderCreateVO;
+import com.diligrp.rider.vo.OrderListPageVO;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 @RestController
 @RequestMapping("/api/admin/rider")
@@ -126,34 +129,31 @@ public class AdminRiderController {
      * 超管：可传 cityId 筛选某城市
      */
     @GetMapping("/order/list")
-    public Result<List<Orders>> orderList(
+    public Result<OrderListPageVO> orderList(
             @RequestParam(required = false) Long cityId,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Integer isTrans,
             @RequestParam(required = false) String keyword,
             @RequestParam(defaultValue = "1") int page,
             HttpServletRequest request) {
+        final int pageSize = 20;
+        int currentPage = Math.max(page, 1);
+        int offset = (currentPage - 1) * pageSize;
         Long scopedCityId = resolveQueryCityId(request, cityId);
-        LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
-                .eq(Orders::getIsDel, 0)
-                .orderByDesc(Orders::getId);
+        LambdaQueryWrapper<Orders> countWrapper = buildOrderListWrapper(scopedCityId, status, isTrans, keyword, false);
+        long total = ordersMapper.selectCount(countWrapper);
-        if (scopedCityId != null) {
-            wrapper.eq(Orders::getCityId, scopedCityId);
-        }
-        if (status != null) wrapper.eq(Orders::getStatus, status);
-        if (isTrans != null) wrapper.eq(Orders::getIsTrans, isTrans);
-        if (keyword != null && !keyword.isBlank()) {
-            wrapper.and(w -> w.like(Orders::getOrderNo, keyword)
-                    .or().like(Orders::getOutOrderNo, keyword)
-                    .or().like(Orders::getRecipName, keyword)
-                    .or().like(Orders::getRecipPhone, keyword));
-        }
-        int offset = (page - 1) * 20;
-        wrapper.last("LIMIT " + offset + ",20");
+        LambdaQueryWrapper<Orders> listWrapper = buildOrderListWrapper(scopedCityId, status, isTrans, keyword, true);
+        listWrapper.last("LIMIT " + offset + "," + pageSize);
-        return Result.success(ordersMapper.selectList(wrapper));
+        OrderListPageVO result = new OrderListPageVO();
+        result.setList(ordersMapper.selectList(listWrapper));
+        result.setPage(currentPage);
+        result.setPageSize(pageSize);
+        result.setTotal(total);
+        result.setStatusSummary(buildStatusSummary(scopedCityId, isTrans, keyword));
+        return Result.success(result);
     }
     /**
@@ -161,26 +161,30 @@ public class AdminRiderController {
      * 按 appKey / outOrderNo 查询
      */
     @GetMapping("/order/delivery/list")
-    public Result<List<Orders>> deliveryOrderList(
+    public Result<OrderListPageVO> deliveryOrderList(
             @RequestParam(required = false) Long cityId,
             @RequestParam(required = false) String appKey,
             @RequestParam(required = false) String outOrderNo,
             @RequestParam(required = false) Integer status,
             @RequestParam(defaultValue = "1") int page,
             HttpServletRequest request) {
-        LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
-                .eq(Orders::getIsDel, 0)
-                .orderByDesc(Orders::getId);
+        final int pageSize = 20;
+        int currentPage = Math.max(page, 1);
+        int offset = (currentPage - 1) * pageSize;
         Long scopedCityId = resolveQueryCityId(request, cityId);
-        if (scopedCityId != null) {
-            wrapper.eq(Orders::getCityId, scopedCityId);
-        }
-        if (appKey != null && !appKey.isBlank()) wrapper.eq(Orders::getAppKey, appKey);
-        if (outOrderNo != null && !outOrderNo.isBlank()) wrapper.like(Orders::getOutOrderNo, outOrderNo);
-        if (status != null) wrapper.eq(Orders::getStatus, status);
-        int offset = (page - 1) * 20;
-        wrapper.last("LIMIT " + offset + ",20");
-        return Result.success(ordersMapper.selectList(wrapper));
+
+        LambdaQueryWrapper<Orders> countWrapper = buildDeliveryOrderListWrapper(scopedCityId, appKey, outOrderNo, status, false);
+        long total = ordersMapper.selectCount(countWrapper);
+
+        LambdaQueryWrapper<Orders> listWrapper = buildDeliveryOrderListWrapper(scopedCityId, appKey, outOrderNo, status, true);
+        listWrapper.last("LIMIT " + offset + "," + pageSize);
+
+        OrderListPageVO result = new OrderListPageVO();
+        result.setList(ordersMapper.selectList(listWrapper));
+        result.setPage(currentPage);
+        result.setPageSize(pageSize);
+        result.setTotal(total);
+        return Result.success(result);
     }
     @GetMapping("/order/delivery/detail")
@@ -204,4 +208,73 @@ public class AdminRiderController {
         Long scopedCityId = resolveScopedCityId(request);
         return scopedCityId != null ? scopedCityId : queryCityId;
     }
+
+    private LambdaQueryWrapper<Orders> buildOrderListWrapper(Long cityId,
+                                                             Integer status,
+                                                             Integer isTrans,
+                                                             String keyword,
+                                                             boolean withOrder) {
+        LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
+                .eq(Orders::getIsDel, 0);
+        if (withOrder) {
+            wrapper.orderByDesc(Orders::getId);
+        }
+        if (cityId != null) {
+            wrapper.eq(Orders::getCityId, cityId);
+        }
+        if (status != null) {
+            wrapper.eq(Orders::getStatus, status);
+        }
+        if (isTrans != null) {
+            wrapper.eq(Orders::getIsTrans, isTrans);
+        }
+        if (keyword != null && !keyword.isBlank()) {
+            wrapper.and(w -> w.like(Orders::getOrderNo, keyword)
+                    .or().like(Orders::getOutOrderNo, keyword)
+                    .or().like(Orders::getRecipName, keyword)
+                    .or().like(Orders::getRecipPhone, keyword));
+        }
+        return wrapper;
+    }
+
+    private Map<String, Long> buildStatusSummary(Long cityId, Integer isTrans, String keyword) {
+        Map<String, Long> summary = new LinkedHashMap<>();
+        summary.put("all", countOrders(cityId, null, isTrans, keyword));
+        summary.put("2", countOrders(cityId, 2, isTrans, keyword));
+        summary.put("3", countOrders(cityId, 3, isTrans, keyword));
+        summary.put("4", countOrders(cityId, 4, isTrans, keyword));
+        summary.put("6", countOrders(cityId, 6, isTrans, keyword));
+        summary.put("7", countOrders(cityId, 7, isTrans, keyword));
+        summary.put("10", countOrders(cityId, 10, isTrans, keyword));
+        return summary;
+    }
+
+    private long countOrders(Long cityId, Integer status, Integer isTrans, String keyword) {
+        return ordersMapper.selectCount(buildOrderListWrapper(cityId, status, isTrans, keyword, false));
+    }
+
+    private LambdaQueryWrapper<Orders> buildDeliveryOrderListWrapper(Long cityId,
+                                                                     String appKey,
+                                                                     String outOrderNo,
+                                                                     Integer status,
+                                                                     boolean withOrder) {
+        LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
+                .eq(Orders::getIsDel, 0);
+        if (withOrder) {
+            wrapper.orderByDesc(Orders::getId);
+        }
+        if (cityId != null) {
+            wrapper.eq(Orders::getCityId, cityId);
+        }
+        if (appKey != null && !appKey.isBlank()) {
+            wrapper.eq(Orders::getAppKey, appKey);
+        }
+        if (outOrderNo != null && !outOrderNo.isBlank()) {
+            wrapper.like(Orders::getOutOrderNo, outOrderNo);
+        }
+        if (status != null) {
+            wrapper.eq(Orders::getStatus, status);
+        }
+        return wrapper;
+    }
 }
+package com.diligrp.rider.vo;
+
+import com.diligrp.rider.entity.Orders;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class OrderListPageVO {
+    private List<Orders> list;
+    private Integer page;
+    private Integer pageSize;
+    private Long total;
+    private Map<String, Long> statusSummary;
+}