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

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -135,6 +135,19 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     private final PartnerDistributionClient partnerDistributionClient;
 
+    /**
+     * 订单审核-任务中心，查询待审核任务
+     * <p>
+     * 功能说明：
+     * 1. 根据查询条件分页获取待审核的订单费用审计任务
+     * 2. 若指定了保险公司ID，则自动包含其下级保险公司的数据
+     * 3. 为每条记录填充保险公司完整层级路径名称
+     * 4. 计算每条订单的权益金额：
+     *    权益金额 = (交强出口费用 + 商业出口费用 + 驾意出口费用) - (交强出口留点费用 + 商业出口留点费用 + 驾意出口留点费用)
+     *
+     * @param param 查询参数，包含分页信息和筛选条件
+     * @return 分页结果，包含订单审核信息及计算后的权益金额
+     */
     @Override
     public Page<FeeAuditVo> queryPage(FeeAuditParam param) {
         log.info("订单审核-任务中心，查询待审核任务。param=[{}]", JSONUtil.toJsonStr(param));
@@ -266,6 +279,15 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     /**
      * 领取审核订单
+     * <p>
+     * 功能说明：
+     * 1. 检查订单是否已被Redis锁定，防止重复领取
+     * 2. 验证订单审核状态，已审核的订单不允许领取
+     * 3. 处理订单领取逻辑：
+     *    - 若订单已被当前用户领取，则刷新Redis锁
+     *    - 若订单已被其他用户领取，则拒绝操作
+     *    - 若订单未被领取，则在满足条件下进行领取
+     * 4. 限制每个用户最多同时领取10个未审核订单
      *
      * @param orderNo 订单编号
      */
@@ -304,6 +326,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 // 领取订单
                 audit.setReceiveUser(userName);
                 audit.setReceiveTime(LocalDateTime.now());
+//                audit.setAuditStatus(1);
                 this.updateById(audit);
 
                 // redis 锁定按钮
@@ -971,6 +994,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         param.getPage().setPages(1);
         param.getPage().setSize(Integer.MAX_VALUE);
         param.setPages(1);
+        param.setSystemCode(baseController.getUserSystemCode());
+        param.setAuditStatus(param.getAuditStatus());
         param.setSize(Integer.MAX_VALUE);
         Page<FeeAuditVo> feeAuditVoPage = this.queryPage(param);
         List<FeeAuditVo> result = feeAuditVoPage.getRecords();

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -89,9 +89,9 @@
             <if test="param.receiveUser != null and param.receiveUser != ''">
                 and ifa.receive_user = #{param.receiveUser}
             </if>
-            <if test="param.receiveUser == null or param.receiveUser == ''">
+            <!--<if test="param.receiveUser == null or param.receiveUser == ''">
                 and ifa.receive_user is null
-            </if>
+            </if>-->
             <if test="param.allTodoReceive != null and param.allTodoReceive == true">
                 and ifa.receive_user is null
             </if>