律师订单接口修改

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerConsultationOrderController.java

@@ -15,6 +15,7 @@ import shop.alien.lawyer.service.OrderExpirationService;
 import shop.alien.util.myBaticsPlus.QueryBuilder;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 咨询订单 前端控制器
@@ -293,7 +294,7 @@ public class LawyerConsultationOrderController {
         return R.data(consultationOrderService.cancelOrder(id));
     }
 
-    @ApiOperation("查询咨询订单（律师端）")
+    @ApiOperation("查询咨询订单信息（律师端）")
     @ApiOperationSupport(order = 14)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "页数（默认1）", dataType = "int", paramType = "query"),
@@ -302,15 +303,15 @@ public class LawyerConsultationOrderController {
             @ApiImplicitParam(name = "endDate", value = "结束时间", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "lawyerId", value = "律师ID", dataType = "String", paramType = "query")
     })
-    @GetMapping("/getLawyerConsultationOrderList")
-    public R<IPage<LawyerConsultationOrderVO>> getLawyerConsultationOrderList(@RequestParam(defaultValue = "1") int page,
-                                                                            @RequestParam(defaultValue = "10") int size,
-                                                                            @RequestParam(required = false) String startDate,
-                                                                            @RequestParam(required = false) String endDate,
-                                                                            @RequestParam(required = true) String lawyerId) {
+    @GetMapping("/getLawyerConsultationOrderInfo")
+    public R<Map<String, Object>> getLawyerConsultationOrderInfo(@RequestParam(defaultValue = "1") int page,
+                                                                 @RequestParam(defaultValue = "10") int size,
+                                                                 @RequestParam(required = false) String startDate,
+                                                                 @RequestParam(required = false) String endDate,
+                                                                 @RequestParam(required = true) String lawyerId) {
         log.info("LawyerConsultationOrderController.getLawyerConsultationOrderList?pageNum={},pageSize={},startDate={},endDate={},lawyerId={}",
                 page, size, startDate, endDate, lawyerId);
-        return consultationOrderService.getLawyerConsultationOrderList(page, size, startDate, endDate, lawyerId);
+        return R.data(consultationOrderService.getLawyerConsultationOrderInfo(page, size, startDate, endDate, lawyerId));
     }
 
 }

alien-lawyer/src/main/java/shop/alien/lawyer/service/LawyerConsultationOrderService.java

@@ -8,6 +8,8 @@ import shop.alien.entity.store.dto.LawyerConsultationOrderDto;
 import shop.alien.entity.store.dto.PayStatusRequest;
 import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
 
+import java.util.Map;
+
 /**
  * 咨询订单 服务类
  *
@@ -110,6 +112,6 @@ public interface LawyerConsultationOrderService extends IService<LawyerConsultat
      * @param lawyerId 律师ID
      * @return IPage<LawyerConsultationOrderVO>
      */
-    R<IPage<LawyerConsultationOrderVO>> getLawyerConsultationOrderList(int pageNum, int pageSize, String startDate, String endDate, String lawyerId);
+    Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String lawyerId);
 }
 

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -331,7 +331,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
         
         // 检查订单状态：进行中的订单不允许删除
         Integer orderStatus = order.getOrderStatus();
-        Integer inProgressStatus = LawyerStatusEnum.USED.getStatus(); // 2:进行中
+        Integer inProgressStatus = LawyerStatusEnum.INPROGRESS.getStatus(); // 2:进行中
         if (inProgressStatus.equals(orderStatus)) {
             log.warn("删除咨询订单失败：订单进行中，不允许删除，订单ID={}, 订单编号={}", 
                     id, order.getOrderNumber());
@@ -732,7 +732,8 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
     }
 
     @Override
-    public R<IPage<LawyerConsultationOrderVO>> getLawyerConsultationOrderList(int pageNum, int pageSize, String startDate, String endDate, String lawyerId) {
+    public Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String lawyerId) {
+        Map<String, Object> resultMap = new HashMap<>();
         Page<LawyerConsultationOrderVO> page = new Page<>(pageNum, pageSize);
 
         // 如果按律师姓名搜索，先查询匹配的律师ID列表
@@ -740,7 +741,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
             Page<LawyerConsultationOrderVO> emptyPage = new Page<>(pageNum, pageSize);
             emptyPage.setRecords(Collections.emptyList());
             emptyPage.setTotal(0);
-            return R.data(emptyPage);
+           // return R.data(emptyPage);
         }
 
         // 查询订单列表
@@ -780,8 +781,16 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
                 }
             }
         }
+//        voPage.get
+        //订单总数
+        resultMap.put("lawyerOrderCount", 0);
+        //进行中数据
+        resultMap.put("lawyerInProgressOrderCount", 0);
+        //已完成数据
+        resultMap.put("lawyerCompleteOrderCount", 0);
 
-        return R.data(voPage);
+
+        return resultMap;
     }
 
     /**