|
|
@@ -338,6 +338,10 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
|
|
|
// 构建状态统计Map
|
|
|
Map<Integer, Integer> statusCountMap = buildStatusCountMap(statisticsInfo);
|
|
|
|
|
|
+ // 统计待接单订单数量
|
|
|
+ Integer waitAcceptStatus = LawyerStatusEnum.WAIT_ACCEPT.getStatus();
|
|
|
+ int waitAcceptStatusCount = statusCountMap.getOrDefault(waitAcceptStatus, 0);
|
|
|
+
|
|
|
// 统计进行中订单数量
|
|
|
Integer inProgressStatus = LawyerStatusEnum.INPROGRESS.getStatus();
|
|
|
int inProgressCount = statusCountMap.getOrDefault(inProgressStatus, 0);
|
|
|
@@ -346,10 +350,16 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
|
|
|
Integer completeStatus = LawyerStatusEnum.COMPLETE.getStatus();
|
|
|
int completeCount = statusCountMap.getOrDefault(completeStatus, 0);
|
|
|
|
|
|
+ // 统计已退款订单数量
|
|
|
+ Integer refundedStatus = LawyerStatusEnum.REFUNDED.getStatus();
|
|
|
+ int refundedStatusCount = statusCountMap.getOrDefault(refundedStatus, 0);
|
|
|
+
|
|
|
// 构建返回结果
|
|
|
resultMap.put("lawyerInProgressOrderCount", inProgressCount);
|
|
|
resultMap.put("lawyerCompleteOrderCount", completeCount);
|
|
|
- resultMap.put("lawyerOrderCount", (long) (inProgressCount + completeCount));
|
|
|
+ resultMap.put("lawyerWaitAcceptStatusOrderCount", waitAcceptStatusCount);
|
|
|
+ resultMap.put("lawyerRefundedStatusOrderCount", refundedStatusCount);
|
|
|
+ resultMap.put("lawyerOrderCount", (long) (inProgressCount + completeCount + waitAcceptStatusCount + refundedStatusCount));
|
|
|
|
|
|
// 设置订单列表
|
|
|
List<LawyerConsultationOrderVO> orderList = (voPage != null && voPage.getRecords() != null)
|