举报代码修改

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

@@ -78,7 +78,7 @@ public class LawyerClientConsultationOrderController {
             @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束时间", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "clientUserName", value = "用户姓名", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "orderStatus", value = "订单状态（2 进行中，3 已完成）", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "orderStatus", value = "订单状态, 0:待支付,1.待接单 2:进行中, 3:已完成, 4:已取消，5.已退款", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "lawyerId", value = "律师ID", dataType = "String", paramType = "query", required = true)
     })
     @GetMapping("/getLawyerConsultationOrderInfo")

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

@@ -145,9 +145,11 @@ public class LawyerUserViolationController {
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(required = false) String orderId,
             @RequestParam(required = false) String processingStatus,
-            @RequestParam(required = false) String reportingUserName) {
-        log.info("LawyerUserViolationController.getViolationPage?pageNum={},pageSize={},orderId={},processingStatus={},reportingUserName={}", pageNum, pageSize, orderId, processingStatus, reportingUserName);
-        return R.data(lawyerUserViolationService.getViolationPage(pageNum, pageSize, orderId, processingStatus, reportingUserName));
+            @RequestParam(required = false) String reportedUserName,
+            @RequestParam(required = false) String violationReason
+    ) {
+        log.info("LawyerUserViolationController.getViolationPage?pageNum={},pageSize={},orderId={},processingStatus={},reportedUserName={},violationReason={}", pageNum, pageSize, orderId, processingStatus, reportedUserName, violationReason);
+        return R.data(lawyerUserViolationService.getViolationPage(pageNum, pageSize, orderId, processingStatus, reportedUserName, violationReason));
     }
 
     @ApiOperation(value = "举报审核")

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

@@ -46,7 +46,7 @@ public interface LawyerUserViolationService extends IService<LawyerUserViolation
      */
     LawyerUserViolationVo reportListById(String id);
 
-    IPage<LawyerUserViolationDto> getViolationPage(int page, int size, String orderId, String processingStatus, String reportingUserName);
+    IPage<LawyerUserViolationDto> getViolationPage(int page, int size, String orderId, String processingStatus, String reportedUserName, String violationReason);
 
     void approve(int id, String processingStatus, String reportResult);
 

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

@@ -421,17 +421,20 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
         Integer inProgressStatus = LawyerStatusEnum.INPROGRESS.getStatus();
         Integer completeStatus = LawyerStatusEnum.COMPLETE.getStatus();
         Integer refundedStatus = LawyerStatusEnum.REFUNDED.getStatus();
+        Integer cancelStatus = LawyerStatusEnum.CANCEL.getStatus();
 
         int waitAcceptCount = statusCountMap.getOrDefault(waitAcceptStatus, 0);
         int inProgressCount = statusCountMap.getOrDefault(inProgressStatus, 0);
         int completeCount = statusCountMap.getOrDefault(completeStatus, 0);
         int refundedCount = statusCountMap.getOrDefault(refundedStatus, 0);
+        int cancelCount = statusCountMap.getOrDefault(cancelStatus, 0);
 
         statistics.put("waitAcceptCount", waitAcceptCount);
         statistics.put("inProgressCount", inProgressCount);
         statistics.put("completeCount", completeCount);
         statistics.put("refundedCount", refundedCount);
-        statistics.put("totalCount", waitAcceptCount + inProgressCount + completeCount + refundedCount);
+        statistics.put("cancelCount", cancelCount);
+        statistics.put("totalCount", waitAcceptCount + inProgressCount + completeCount + refundedCount + cancelCount);
 
         return statistics;
     }
@@ -482,9 +485,9 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
         } else {
             // 默认查询非待支付和已取消的订单
             Integer waitPayStatus = LawyerStatusEnum.WAIT_PAY.getStatus();
-            Integer cancelStatus = LawyerStatusEnum.CANCEL.getStatus();
+            //Integer cancelStatus = LawyerStatusEnum.CANCEL.getStatus();
             queryWrapper.notIn("lco.order_status",
-                    Arrays.asList(String.valueOf(cancelStatus), String.valueOf(waitPayStatus)));
+                    Arrays.asList( String.valueOf(waitPayStatus)));
         }
 
         // 律师ID条件

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

@@ -736,7 +736,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
     }
 
     @Override
-    public IPage<LawyerUserViolationDto> getViolationPage(int page, int size, String orderId, String processingStatus, String reportingUserName) {
+    public IPage<LawyerUserViolationDto> getViolationPage(int page, int size, String orderId, String processingStatus, String reportedUserName, String violationReason) {
         IPage<LawyerUserViolationVo> pageRequest = new Page<>(page, size);
         QueryWrapper<LawyerUserViolationVo> queryWrapper = new QueryWrapper<>();
 
@@ -749,9 +749,14 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
         if (StringUtils.isNotEmpty(processingStatus)) {
             queryWrapper.eq("luv.processing_status", processingStatus);
         }
-        // 举报人名称模糊查询
-        if (StringUtils.isNotEmpty(reportingUserName)) {
-            queryWrapper.like("ui.nick_name", reportingUserName);
+        // 被举报人名称模糊查询
+        if (StringUtils.isNotEmpty(reportedUserName)) {
+            queryWrapper.like("ui_reported.nick_name", reportedUserName);
+        }
+
+        // 被举报人名称模糊查询
+        if (StringUtils.isNotEmpty(violationReason)) {
+            queryWrapper.eq("luv.violation_reason", violationReason);
         }
 
         queryWrapper.orderByDesc("luv.updated_time");