私有协议-应收订单，可用查询所有的订单(开过票的也可以查询)

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreement.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.po;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -10,12 +11,14 @@ import lombok.Data;
 
 /**
  * 协议信息表
- * @TableName ptl_agreement
+ * ptl_agreement
  */
 @Schema(description = "协议管理表")
 @Data
 public class PtlAgreement extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 8962555764674070017L;
     /** 主键 */
     @Schema(description = "主键")
     private String id;

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreementCost.java

@@ -7,18 +7,21 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 import java.util.Date;
 
 
 /**
- * @author: JZG 协议费用管理
+ * @author JZG 协议费用管理
  */
 
 @Data
 @TableName("ptl_agreement_cost")
 public class PtlAgreementCost extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = -985496146546865007L;
     @TableId(type = IdType.ASSIGN_ID)
     private String id;
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -23,7 +23,6 @@ import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.po.*;
-import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.entity.quote.vo.base.LoginBase;
@@ -39,7 +38,6 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.entity.GetCaptchaRequest;
-import com.jzg.quotation.commons.entity.GetCaptchaResponse;
 import com.jzg.quotation.commons.service.GetCaptchaBaseService;
 import com.jzg.quotation.commons.service.QuotationBaseService;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
@@ -286,7 +284,9 @@ public class UnifyOrderManager {
                 QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
             }
             log.info("报价后数据");
+            log.info("调用保险公司的api进行报价：报价参数： quoteVO=[{}]", JSONUtil.toJsonStr(quoteVo));
             quoteResultsVo = quoteService.quote(quoteVo);
+            log.info("调用保险公司的api进行报价：报价结果： quoteResultsVo=[{}]", JSONUtil.toJsonStr(quoteResultsVo));
             // 格式化保费为两位小数
             QuoteResultsVo.CostsVo costs = quoteResultsVo.getCosts();
             if (BeanUtil.isNotEmpty(costs)) {

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

@@ -1,24 +1,31 @@
 package com.jzg.quotation.summary.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.quotation.summary.mapper.InsOrdersCostsMapper;
 import com.jzg.quotation.summary.service.InsOrdersCostsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class InsOrdersCostsServiceImpl extends ServiceImpl<InsOrdersCostsMapper, InsOrdersCosts> implements InsOrdersCostsService {
+
+    private static final Logger log = LoggerFactory.getLogger(InsOrdersCostsServiceImpl.class);
     @Override
     public void createCosts(InsOrders insOrders) {
         InsOrdersCosts insOrdersCosts = new InsOrdersCosts();
         insOrdersCosts.setOrderNo(insOrders.getId());
+        log.info("新增订单的费用信息：insOrdersCosts=[{}]", JSONUtil.toJsonStr(insOrdersCosts));
         this.save(insOrdersCosts);
     }
 
     @Override
     public void updateMainCosts(InsOrders insOrders) {
         InsOrdersCosts byId = this.getById(insOrders.getId());
+        log.info("更新订单的费用信息：byId=[{}]", JSONUtil.toJsonStr(byId));
 //        this.updateById(byId);
 
     }

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

@@ -80,7 +80,6 @@ import java.net.URL;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -320,7 +319,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.updateById(insOrders);
             if (insertResult <= 0) {
-                log.error("订单插入失败，订单信息: {}");
+                log.error("订单插入失败，订单信息: {}", JSONUtil.toJsonStr(insOrders));
                 return HttpResult.error("修改订单失败");
             }
             String quoteNo = insOrders.getId();

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementController.java

@@ -9,6 +9,7 @@ import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.po.PtlAgreementCostExternal;
+import com.jzg.commons.entity.vo.AgreementInfoVo;
 import com.jzg.commons.entity.vo.AgreementVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.AssertionUtils;
@@ -59,12 +60,12 @@ public class AgreementController extends BaseController {
 
     /**
      * 协议信息查询
-     * @param id
-     * @return
+     * @param id 协议id
+     * @return HttpResult<AgreementInfoVo>
      */
     @GetMapping(value = { "/agreementGet"})
     @Operation(summary = "协议信息查询")
-    public HttpResult agreementGet(String id) {
+    public HttpResult<AgreementInfoVo> agreementGet(String id) {
         return HttpResult.ok(agreementService.queryById(id));
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementService.java

@@ -38,8 +38,8 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 协议明细查询
-     * @param id
-     * @return
+     * @param id 协议ID值
+     * @return AgreementInfoVo 协议详细信息
      */
     AgreementInfoVo queryById(String id);
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -205,6 +205,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
     @Override
     public HttpResult queryById(Long id) {
+        log.info("查询协议的费用信息：协议费用id=[{}]", id);
         PtlAgreementCostVo ptlAgreementCostVo = ptlAgreementCostMapper.queryById(id);
         if (ObjectUtil.isEmpty(ptlAgreementCostVo)){
             return HttpResult.ok(ptlAgreementCostVo);

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -148,6 +148,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     public AgreementInfoVo queryById(String id) {
+        log.info("根据协议id=[{}]查询协议详情", id);
         AgreementVo agreementVo = this.isExistById(id);
         if(StringUtils.isNotBlank(agreementVo.getFileName())){
             String fileUrl = MinioUtils.getPresignedObjectUrl(bucketName,agreementVo.getFileName());

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -197,6 +197,7 @@
         </if>
     </select>
 
+    <!-- modify by lipf, 2026年5月18日14:56:29 和业务沟通后，业务王文琦，想要将开过票的订单也显示出来  -->
     <sql id="query">
         SELECT
         io.real_quote_user_id,
@@ -255,7 +256,6 @@
         LEFT JOIN ins_orders_risk ior2 ON ipi.order_no = ior2.order_no and ior2.risk_code = '0510'
         LEFT JOIN ins_orders_policy iop ON ipi.order_no = iop.order_no
         WHERE 1=1 and ipi.settlement_status = '0'
-        AND NOT EXISTS ( SELECT 1 FROM ins_ply_income_invoice_link ipil WHERE ipil.income_id = ipi.id )
     </sql>
 
     <!--根据保司id和订单号进行过滤 2026年5月12日15:06:40  lipf  -->