加入律师通知接口

alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerConsultationOrderVO.java

@@ -220,5 +220,14 @@ public class LawyerConsultationOrderVO implements Serializable {
 
     @ApiModelProperty(value = "申请退款处理时间")
     private  Date applyRefundProcessTime;
+
+    @ApiModelProperty(value = "举报处理状态(0：待处理，1：已通过，2：已驳回)")
+    private  String processingStatus;
+
+    @ApiModelProperty(value = "举报处理时间")
+    private  Date processingTime;
+
+    @ApiModelProperty(value = "举报处理结果")
+    private  String reportResult;
 }
 

alien-entity/src/main/java/shop/alien/mapper/LawyerConsultationOrderMapper.java

@@ -342,12 +342,16 @@ public interface LawyerConsultationOrderMapper extends BaseMapper<LawyerConsulta
             "        lea.expertise_area_info,\n" +
             "        lur.user_name client_user_name,\n" +
             "        lur.user_phone client_user_phone,\n" +
-            "        lco.order_amount - lco.consultation_fee as lawyerEarnings\n" +
+            "        lco.order_amount - lco.consultation_fee as lawyerEarnings,\n" +
+            "        luv.processing_status,\n" +
+            "        luv.processing_time,\n" +
+            "        luv.report_result\n" +
             "        FROM lawyer_consultation_order lco\n" +
             "        LEFT JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id AND lu.delete_flag = 0\n" +
             "        LEFT JOIN law_firm lf on lf.id = lu.firm_id\n" +
             "        left join lawyer_expertise_area lea on lea.id = lu.lawyer_expertise_area_id and lea.delete_flag = 0 " +
             "        left join life_user lur on lur.id = lco.client_user_id " +
+            "        left join lawyer_user_violation luv on luv.order_number = lco.order_number and luv.delete_flag = 0 " +
             " ${ew.customSqlSegment}")
     IPage<LawyerConsultationOrderVO> getLawyerConsultationOrderInfo(
             IPage<LawyerConsultationOrderVO> page, @Param(Constants.WRAPPER) QueryWrapper<LawyerConsultationOrderVO> queryWrapper

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

@@ -487,7 +487,7 @@ 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(waitPayStatus)));
         }