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

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -355,17 +355,18 @@ public class QuoteEchoVo extends QuoteVo {
             if(item.getRiskCode().equals(RiskCode.TRAFFIC.getCode())){
                 RiskInfoVo riskInfoVo = new RiskInfoVo();
                 riskInfoVo.setRiskCode(RiskCode.TRAFFIC.getCode());
-                riskInfoVo.setStartDate(item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                riskInfoVo.setEndDate(item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                riskInfoVo.setInstantFlag(item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0);
+                // modify by lipf, 提高代码的健壮性 2026年6月2日18:57:09
+                riskInfoVo.setStartDate(item.getStartDate() != null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")): "");
+                riskInfoVo.setEndDate(item.getEndDate() != null ?  item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setInstantFlag(item.getStartDate() != null ? item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0: false);
                 this.setCiRiskInfoVo(riskInfoVo);
             }
             if(item.getRiskCode().equals(RiskCode.BUSINESS.getCode())){
                 RiskInfoVo riskInfoVo = new RiskInfoVo();
                 riskInfoVo.setRiskCode(RiskCode.BUSINESS.getCode());
-                riskInfoVo.setStartDate(item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                riskInfoVo.setEndDate(item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                riskInfoVo.setInstantFlag(item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0);
+                riskInfoVo.setStartDate(item.getStartDate() !=null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setEndDate(item.getEndDate() != null ? item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setInstantFlag(item.getStartDate() != null && (item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0));
                 this.setBiRiskInfoVo(riskInfoVo);
             }
         });

commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.entity.po.InsFeeOrders;
+import com.jzg.commons.util.BigDecimalUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -166,19 +167,19 @@ public class InsFeeOrdersVo {
         this.costId = insFeeOrders.getCostId();
         this.userId = insFeeOrders.getUserId();
         this.signTime = insFeeOrders.getSigningTime();
-        this.jqPremium = insFeeOrders.getJqPremium().toString();
-        this.syPremium = insFeeOrders.getSyPremium().toString();
-        this.jyPremium = insFeeOrders.getJyPremium().toString();
-        this.totalPremium = insFeeOrders.getTotalPremium().toString();
-        this.jqReceivablePremium = insFeeOrders.getJqReceivablePremium().toString();
-        this.syReceivablePremium = insFeeOrders.getSyReceivablePremium().toString();
-        this.jyReceivablePremium = insFeeOrders.getJyReceivablePremium().toString();
-        this.totalReceivablePremium = insFeeOrders.getTotalReceivablePremium().toString();
-        this.jqPayablePremium = insFeeOrders.getJqPayablePremium().toString();
-        this.syPayablePremium = insFeeOrders.getSyPayablePremium().toString();
-        this.jyPayablePremium = insFeeOrders.getJyPayablePremium().toString();
-        this.totalPayablePremium = insFeeOrders.getTotalPayablePremium().toString();
-        this.jqCommissionPremium = insFeeOrders.getJqCommissionPremium().toString();
+        this.jqPremium = convert2Str(insFeeOrders.getJqPremium());
+        this.syPremium = convert2Str(insFeeOrders.getSyPremium());
+        this.jyPremium = convert2Str(insFeeOrders.getJyPremium());
+        this.totalPremium = convert2Str(insFeeOrders.getTotalPremium());
+        this.jqReceivablePremium = insFeeOrders.getJqReceivablePremium() != null ? insFeeOrders.getJqReceivablePremium().toString(): "0";
+        this.syReceivablePremium = insFeeOrders.getSyReceivablePremium() !=null ? insFeeOrders.getSyReceivablePremium().toString() : "0";
+        this.jyReceivablePremium = insFeeOrders.getJyReceivablePremium() != null ? insFeeOrders.getJyReceivablePremium().toString() : "0";
+        this.totalReceivablePremium = insFeeOrders.getTotalReceivablePremium()!= null ? insFeeOrders.getTotalReceivablePremium().toString(): "0";
+        this.jqPayablePremium = insFeeOrders.getJqPayablePremium() != null ? insFeeOrders.getJqPayablePremium().toString():"0";
+        this.syPayablePremium = insFeeOrders.getSyPayablePremium() != null ? insFeeOrders.getSyPayablePremium().toString(): "0";
+        this.jyPayablePremium = insFeeOrders.getJyPayablePremium()!= null? insFeeOrders.getJyPayablePremium().toString():"0";
+        this.totalPayablePremium = insFeeOrders.getTotalPayablePremium() != null ? insFeeOrders.getTotalPayablePremium().toString():"0";
+        this.jqCommissionPremium = insFeeOrders.getJqCommissionPremium() != null ? insFeeOrders.getJqCommissionPremium().toString():"0";
         this.syCommissionPremium = insFeeOrders.getSyCommissionPremium() != null ? insFeeOrders.getSyCommissionPremium().toString() : "0.00";
         this.jyCommissionPremium = insFeeOrders.getJyCommissionPremium() != null ? insFeeOrders.getJyCommissionPremium().toString() : "0.00";
         this.jqFollowPremium = insFeeOrders.getJqFollowPremium() != null ? insFeeOrders.getJqFollowPremium().toString() : "0.00";
@@ -205,8 +206,15 @@ public class InsFeeOrdersVo {
         this.usedAmount = insFeeOrders.getUsedAmount() != null ? insFeeOrders.getUsedAmount() : BigDecimal.ZERO;
 
         //出口总费用
-        this.totalExportPremium = insFeeOrders.getJqExportPremium().add(insFeeOrders.getSyExportPremium().add(insFeeOrders.getJyExportPremium()));
+        this.totalExportPremium = BigDecimalUtil.add(BigDecimalUtil.add(insFeeOrders.getJqExportPremium(),insFeeOrders.getSyExportPremium()),insFeeOrders.getJyExportPremium());
         //出口留点总费用
-        this.totalExportKeepPointPremium = insFeeOrders.getJqExportKeepPointPremium().add(insFeeOrders.getSyExportKeepPointPremium().add(insFeeOrders.getJyExportKeepPointPremium()));
+        this.totalExportKeepPointPremium = BigDecimalUtil.add(BigDecimalUtil.add(insFeeOrders.getJqExportKeepPointPremium(),insFeeOrders.getSyExportKeepPointPremium()),insFeeOrders.getJyExportKeepPointPremium());
+    }
+
+    public String convert2Str(BigDecimal num){
+        if(num == null){
+            return "0";
+        }
+        return num.toString();
     }
 }

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

@@ -577,7 +577,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON o.id = ioa1.order_no
         <where>
-            and o.is_delete = 0
+            and o.is_delete = 0 and o.parent_id != 0
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND o.quote_no = #{insOrdersParam.orderNo}
             </if>
@@ -814,7 +814,7 @@
         order by create_time desc
     </select>
 
-    <!--查询车险报价订单 modify by lipf 2026年4月28日09:22:46 -->
+    <!--查询车险报价订单 modify by lipf 2026年4月28日09:22:46  和田智确认后，将主订单过滤掉-->
     <select id="queryOrderList" resultType="com.jzg.commons.entity.orders.vo.OrderListVo">
         SELECT
         io.id as order_no,
@@ -893,7 +893,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0
+            and io.is_delete = 0  and io.parent_id != '0'
             <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                 and io.real_quote_user_id in (select username from  sys_user bbb where bbb.id in (
                 select ss.user_id from sys_user_jzg_info ss where ss.leader_id = #{insOrdersParam.jzgInfoId} and ss.is_delete = 0