Merge remote-tracking branch 'origin/sit' into sit

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

@@ -73,7 +73,6 @@
                     COALESCE(SUM(lco.order_amount), 0) as total_amount
                 FROM lawyer_consultation_order lco
                 INNER JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id
-                AND lu.delete_flag = 0
                 LEFT JOIN law_firm lf ON lf.id = lu.firm_id
                     AND lf.delete_flag = 0
                     <if test="startDate != null">
@@ -93,7 +92,6 @@
                     COALESCE(SUM(lco.order_amount), 0) as total_amount
                 FROM lawyer_consultation_order lco
                 INNER JOIN lawyer_user lu ON lco.lawyer_user_id = lu.id
-                AND lu.delete_flag = 0
                 LEFT JOIN law_firm lf ON lf.id = lu.firm_id
                 AND lf.delete_flag = 0
                 WHERE
@@ -138,13 +136,13 @@
         LEFT JOIN lawyer_consultation_order lco ON lco.lawyer_user_id = lu.id
             AND lco.delete_flag = 0
             AND lco.order_status = 3
+        WHERE lf.delete_flag = 0
             <if test="startDate != null">
                 AND lco.order_time &gt;= CONCAT(#{startDate}, ' 00:00:00')
             </if>
             <if test="endDate != null">
                 AND lco.order_time &lt;= CONCAT(#{endDate}, ' 23:59:59')
             </if>
-        WHERE lf.delete_flag = 0
         <if test="firmName != null and firmName != ''">
             AND lf.firm_name LIKE CONCAT('%', #{firmName}, '%')
         </if>
@@ -201,16 +199,18 @@
         LEFT JOIN lawyer_consultation_order lco ON lco.lawyer_user_id = lu.id
             AND lco.delete_flag = 0
             AND lco.order_status = 3
+        <where>
+            1=1
             <if test="startDate != null">
                 AND lco.order_time &gt;= CONCAT(#{startDate}, ' 00:00:00')
             </if>
             <if test="endDate != null">
                 AND lco.order_time &lt;= CONCAT(#{endDate}, ' 23:59:59')
             </if>
-        WHERE lu.delete_flag = 0
-        <if test="lawyerName != null and lawyerName != ''">
-            AND lu.name LIKE CONCAT('%', #{lawyerName}, '%')
-        </if>
+            <if test="lawyerName != null and lawyerName != ''">
+                AND lu.name LIKE CONCAT('%', #{lawyerName}, '%')
+            </if>
+        </where>
         GROUP BY lu.id, lu.name, lu.head_img, lu.lawyer_certificate_no, lf.id, lf.firm_name
         ORDER BY COALESCE(SUM(lco.order_amount), 0) DESC
     </select>
@@ -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/AiUploadController.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiSort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,13 +38,8 @@ public class AiUploadController {
             return R.fail("音频文件不能为空");
         }
         
-        String accessToken = aiFeedbackAssignUtils.getAccessToken();
-        if (!StringUtils.hasText(accessToken)) {
-          return  R.fail("调用AI语音识别接口 登录接口失败");
-        }
-        
         try {
-            String speechRecognitionResult = aiFeedbackAssignUtils.getSpeechRecognition1(file, accessToken, language, use_itn, merge_vad);
+            String speechRecognitionResult = aiFeedbackAssignUtils.getSpeechRecognition1(file, null, language, use_itn, merge_vad);
             if (speechRecognitionResult == null) {
                 return R.fail("语音识别失败");
             }

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);