中台 律师对账 律师完成订单

alien-entity/src/main/resources/mapper/LawFirmMapper.xml

@@ -235,7 +235,6 @@
             life_user.user_name as client_user_name
         FROM lawyer_consultation_order lco
         INNER JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id
-            AND lu.delete_flag = 0
         LEFT JOIN life_user ON lco.client_user_id = life_user.id
             AND life_user.delete_flag = 0
         WHERE lco.lawyer_user_id = #{lawyerId}

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

@@ -126,8 +126,8 @@ public class LawFirmReconciliationController {
     @GetMapping("/getLawyerOrderList")
     public R<IPage<LawFirmReconciliationVO>> getLawyerOrderList(
             @RequestParam(value = "lawyerId") Integer lawyerId,
-            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+            @RequestParam(value = "pageNum") Integer pageNum,
+            @RequestParam(value = "pageSize") Integer pageSize) {
         log.info("LawFirmReconciliationController.getLawyerOrderList?lawyerId={},pageNum={},pageSize={}",
                 lawyerId, pageNum, pageSize);
         return lawFirmReconciliationService.getLawyerOrderList(lawyerId, pageNum, pageSize);

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

@@ -232,15 +232,15 @@ public class LawFirmReconciliationServiceImpl implements LawFirmReconciliationSe
         if (lawyerId == null) {
             return R.fail("律师ID不能为空");
         }
-        LawyerUser lawyerUser = lawyerUserService.getById(lawyerId);
-        if (lawyerUser == null || (lawyerUser.getDeleteFlag() != null && lawyerUser.getDeleteFlag() == 1)) {
-            return R.fail("律师不存在或已被删除");
-        }
+//        LawyerUser lawyerUser = lawyerUserService.getById(lawyerId);
+//        if (lawyerUser == null || (lawyerUser.getDeleteFlag() != null && lawyerUser.getDeleteFlag() == 1)) {
+//            return R.fail("律师不存在或已被删除");
+//        }
 
         // 创建分页对象
-        int pageNumValue = pageNum != null && pageNum > 0 ? pageNum : 1;
-        int pageSizeValue = pageSize != null && pageSize > 0 ? pageSize : 10;
-        Page<LawFirmReconciliationVO> page = new Page<>(pageNumValue, pageSizeValue);
+//        int pageNumValue = pageNum != null && pageNum > 0 ? pageNum : 1;
+//        int pageSizeValue = pageSize != null && pageSize > 0 ? pageSize : 10;
+        Page<LawFirmReconciliationVO> page = new Page<>(pageNum, pageSize);
 
         // 查询律师的已完成订单列表
         IPage<LawFirmReconciliationVO> orderPage = lawFirmMapper.getLawyerOrderList(page, lawyerId);

alien-store/src/main/java/shop/alien/store/controller/LawFirmReconciliationController.java

@@ -125,8 +125,8 @@ public class LawFirmReconciliationController {
     @GetMapping("/getLawyerOrderList")
     public R<IPage<LawFirmReconciliationVO>> getLawyerOrderList(
             @RequestParam(value = "lawyerId") Integer lawyerId,
-            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+            @RequestParam(value = "pageNum") Integer pageNum,
+            @RequestParam(value = "pageSize") Integer pageSize) {
         log.info("LawFirmReconciliationController.getLawyerOrderList?lawyerId={},pageNum={},pageSize={}",
                 lawyerId, pageNum, pageSize);
         return lawFirmReconciliationService.getLawyerOrderList(lawyerId, pageNum, pageSize);

alien-store/src/main/java/shop/alien/store/service/impl/LawFirmReconciliationServiceImpl.java

@@ -232,15 +232,15 @@ public class LawFirmReconciliationServiceImpl implements LawFirmReconciliationSe
         if (lawyerId == null) {
             return R.fail("律师ID不能为空");
         }
-        LawyerUser lawyerUser = lawyerUserService.getById(lawyerId);
-        if (lawyerUser == null || (lawyerUser.getDeleteFlag() != null && lawyerUser.getDeleteFlag() == 1)) {
-            return R.fail("律师不存在或已被删除");
-        }
+//        LawyerUser lawyerUser = lawyerUserService.getById(lawyerId);
+//        if (lawyerUser == null || (lawyerUser.getDeleteFlag() != null && lawyerUser.getDeleteFlag() == 1)) {
+//            return R.fail("律师不存在或已被删除");
+//        }
 
         // 创建分页对象
-        int pageNumValue = pageNum != null && pageNum > 0 ? pageNum : 1;
-        int pageSizeValue = pageSize != null && pageSize > 0 ? pageSize : 10;
-        Page<LawFirmReconciliationVO> page = new Page<>(pageNumValue, pageSizeValue);
+//        int pageNumValue = pageNum != null && pageNum > 0 ? pageNum : 1;
+//        int pageSizeValue = pageSize != null && pageSize > 0 ? pageSize : 10;
+        Page<LawFirmReconciliationVO> page = new Page<>(pageNum, pageSize);
 
         // 查询律师的已完成订单列表
         IPage<LawFirmReconciliationVO> orderPage = lawFirmMapper.getLawyerOrderList(page, lawyerId);