律师订单接口修改

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

@@ -312,9 +312,10 @@ public class LawyerConsultationOrderController {
             @RequestParam(required = false) String startDate,
             @RequestParam(required = false) String endDate,
             @RequestParam(required = false) String clientUserName,
+            @RequestParam(required = false) String orderStatus,
             @RequestParam(required = true) String lawyerId) {
-        log.info("LawyerConsultationOrderController.getLawyerConsultationOrderInfo?page={},size={},startDate={},endDate={},clientUserName={},lawyerId={}",
-                page, size, startDate, endDate, clientUserName, lawyerId);
+        log.info("LawyerConsultationOrderController.getLawyerConsultationOrderInfo?page={},size={},startDate={},endDate={},clientUserName={},orderStatus={},lawyerId={}",
+                page, size, startDate, endDate, clientUserName, orderStatus, lawyerId);
 
         // 参数校验
         if (lawyerId == null || lawyerId.trim().isEmpty()) {
@@ -326,7 +327,7 @@ public class LawyerConsultationOrderController {
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;
 
-        return R.data(consultationOrderService.getLawyerConsultationOrderInfo(pageNum, pageSize, startDate, endDate, clientUserName, lawyerId));
+        return R.data(consultationOrderService.getLawyerConsultationOrderInfo(pageNum, pageSize, startDate, endDate, clientUserName, orderStatus, lawyerId));
     }
 
 }

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

@@ -112,6 +112,6 @@ public interface LawyerConsultationOrderService extends IService<LawyerConsultat
      * @param lawyerId 律师ID
      * @return IPage<LawyerConsultationOrderVO>
      */
-    Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String clientUserName, String lawyerId);
+    Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String clientUserName, String orderStatus, String lawyerId);
 }
 

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

@@ -742,7 +742,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
      * @return 订单信息Map，包含订单列表、总数、进行中数量、已完成数量
      */
     @Override
-    public Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String clientUserName, String lawyerId) {
+    public Map<String, Object> getLawyerConsultationOrderInfo(int pageNum, int pageSize, String startDate, String endDate, String clientUserName, String orderStatus, String lawyerId) {
         log.info("LawyerConsultationOrderServiceImpl.getLawyerConsultationOrderInfo?pageNum={},pageSize={},startDate={},endDate={},clientUserName={},lawyerId={}",
                 pageNum, pageSize, startDate, endDate, clientUserName, lawyerId);
 
@@ -766,9 +766,9 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
 
         // 构建查询条件：查询进行中(2)和已完成(3)状态的订单
         QueryWrapper<LawyerConsultationOrderVO> queryWrapper = new QueryWrapper<>();
-//        if(){
-//
-//        }
+        if(StringUtils.hasText(orderStatus)){
+            queryWrapper.in("lco.order_status", Collections.singletonList(orderStatus));
+        }
         queryWrapper.in("lco.order_status", Arrays.asList("2", "3"));
         queryWrapper.eq("lco.lawyer_user_id", lawyerId);
         if(StringUtils.hasText(clientUserName)){