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

@@ -75,6 +75,7 @@ public class QuoteEchoVo extends QuoteVo {
         private LocalDateTime quoteTime;
         private String signingTime;
         private String payTime;
+        private String orderType;
     }
 
     private OrderBaseVo order;
@@ -309,6 +310,7 @@ public class QuoteEchoVo extends QuoteVo {
         this.getOrder().setCreateTime(insOrdersVo.getCreateTime());
         this.getOrder().setQuoteTime(insOrdersVo.getCreateTime());
         this.getOrder().setSigningTime(insOrdersVo.getPayTime());
+        this.getOrder().setOrderType(insOrdersVo.getOrderType());
         this.setCiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0507")).collect(Collectors.toList()));
         this.setBiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0510")).collect(Collectors.toList()));
         Salesman salesman = new Salesman();

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -72,6 +72,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "错误信息")
     private String errorMessage;
 
+    @Schema(description = "订单类型")
+    private String orderType;
+
     @Schema(description = "录单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;

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

@@ -117,6 +117,24 @@ public class InsFeeOrdersVo {
     @Schema(description = "驾意入口比例")
     private BigDecimal jyInletRatio;
 
+    @Schema(description = "交强险留点费用")
+    private String jqKeepPointPremium;
+
+    @Schema(description = "商业险留点费用")
+    private String syKeepPointPremium;
+
+    @Schema(description = "驾意险留点费用")
+    private String jyKeepPointPremium;
+
+    @Schema(description = "交强出口费用")
+    private String jqExportPremium;
+
+    @Schema(description = "商业出口费用")
+    private String syExportPremium;
+
+    @Schema(description = "驾意出口费用")
+    private String jyExportPremium;
+
     @Schema(description = "交强险出口留点费用")
     private String jqExportKeepPointPremium;
 
@@ -170,6 +188,13 @@ public class InsFeeOrdersVo {
         this.syAdditionalPremium = insFeeOrders.getSyAdditionalPremium() != null ? insFeeOrders.getSyAdditionalPremium().toString() : "0.00";
         this.jyAdditionalPremium = insFeeOrders.getJyAdditionalPremium() != null ? insFeeOrders.getJyAdditionalPremium().toString() : "0.00";
 
+        this.jqExportPremium = insFeeOrders.getJqExportPremium() != null ? insFeeOrders.getJqExportPremium().toString() : "0.00";
+        this.syExportPremium = insFeeOrders.getSyExportPremium() != null ? insFeeOrders.getSyExportPremium().toString() : "0.00";
+        this.jyExportPremium = insFeeOrders.getJyExportPremium() != null ? insFeeOrders.getJyExportPremium().toString() : "0.00";
+
+        this.jqKeepPointPremium = insFeeOrders.getJqKeepPointPremium() != null ? insFeeOrders.getJqKeepPointPremium().toString() : "0.00";
+        this.syKeepPointPremium = insFeeOrders.getSyKeepPointPremium() != null ? insFeeOrders.getSyKeepPointPremium().toString() : "0.00";
+        this.jyKeepPointPremium = insFeeOrders.getJyKeepPointPremium() != null ? insFeeOrders.getJyKeepPointPremium().toString() : "0.00";
 
         this.jqExportKeepPointPremium = insFeeOrders.getJqExportKeepPointPremium() != null ? insFeeOrders.getJqExportKeepPointPremium().toString() : "0.00";
         this.syExportKeepPointPremium = insFeeOrders.getSyExportKeepPointPremium() != null ? insFeeOrders.getSyExportKeepPointPremium().toString() : "0.00";

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

@@ -708,7 +708,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         }
         // 保存比例调整记录
         InsFeeOrderRecord record = new InsFeeOrderRecord(param);
-        recordService.save(record);
+        recordService.updateById(record);
     }
 
     /**

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

@@ -66,7 +66,8 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         // 常量定义 保留小数5位
         final int SCALE = 5;
         final RoundingMode ROUNDING_MODE = RoundingMode.HALF_EVEN;
-        final BigDecimal TAX_FACTOR = new BigDecimal("1").divide(new BigDecimal("1.06"), 10, ROUNDING_MODE);
+        final BigDecimal ONE_HUNDRED = new BigDecimal("100");
+        final BigDecimal TAX_RATE = new BigDecimal("1.06");
 
         // 获取订单信息
         InsOrders insOrders = insOrdersService.getById(ptlAgreementCostRatioVo.getOrderNo());
@@ -78,83 +79,138 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrders.getAgreementId());
         // 获取费用信息
         InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectById(insOrders.getId());
-        // 保费
-        BigDecimal jqPremium = insOrdersCosts.getJqPremium();
-        BigDecimal syPremium = insOrdersCosts.getSyPremium();
-        BigDecimal jyPremium = insOrdersCosts.getJyPremium();
-        // 手续费比例
-        BigDecimal jqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
-        BigDecimal syCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
-        BigDecimal jyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
-        // 跟单费比例
-        BigDecimal jqFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJqFollowRatio());
-        BigDecimal syFollowRatio = covertPercent(ptlAgreementCostRatioVo.getSyFollowRatio());
-        BigDecimal jyFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJyFollowRatio());
-        // 加投费比例
-        BigDecimal jqAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio());
-        BigDecimal syAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getSyAdditionalRatio());
-        BigDecimal jyAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJyAdditionalRatio());
-        // 留点比例
-        BigDecimal jqKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqKeepPointRatio());
-        BigDecimal syKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyKeepPointRatio());
-        BigDecimal jyKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyKeepPointRatio());
-        // 入口比例
-        BigDecimal jqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
-        BigDecimal syInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
-        BigDecimal jyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
-        // 出口比例
-        BigDecimal jqExportRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportRatio());
-        BigDecimal syExportRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportRatio());
-        BigDecimal jyExportRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportRatio());
 
-        // 出口留点比例
-        BigDecimal jqExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportKeepPointRatio());
-        BigDecimal syExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportKeepPointRatio());
-        BigDecimal jyExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportKeepPointRatio());
-
-        List<CostTypeParam> typeParams = Arrays.asList(
-                new CostTypeParam("jq", jqPremium, jqCommissionRatio, jqFollowRatio, jqAddThrowRatio,
-                        jqKeepPointRatio, jqInletRatio, jqExportRatio, jqExportKeepPointRatio),
-                new CostTypeParam("sy", syPremium, syCommissionRatio, syFollowRatio, syAddThrowRatio,
-                        syKeepPointRatio, syInletRatio, syExportRatio, syExportKeepPointRatio),
-                new CostTypeParam("jy", jyPremium, jyCommissionRatio, jyFollowRatio, jyAddThrowRatio,
-                        jyKeepPointRatio, jyInletRatio, jyExportRatio, jyExportKeepPointRatio)
-        );
-        // 5. 根据协议类型计算费用
-        boolean isPlatformAgreement = ptlAgreement.getAgreementType() == 1;
-        BigDecimal totalReceivable = BigDecimal.ZERO;
-        BigDecimal totalPayable = BigDecimal.ZERO;
-
-        for (CostTypeParam param : typeParams) {
-            // 5.1 计算基础保费（平台协议直接用原始保费，私有协议扣税）
-            BigDecimal basePremium = isPlatformAgreement ?
-                    param.premium : divideTaxFactor(param.premium, TAX_FACTOR, SCALE);
-
-            // 5.2 计算各类费用
-            BigDecimal commission = calculateFee(basePremium, param.commissionRatio, SCALE);
-            BigDecimal follow = calculateFee(basePremium, param.followRatio, SCALE);
-            BigDecimal addThrow = calculateFee(basePremium, param.addThrowRatio, SCALE);
-            BigDecimal keepPoint = calculateFee(basePremium, param.keepPointRatio, SCALE);
-            BigDecimal inlet = calculateFee(basePremium, param.inletRatio, SCALE);
-            BigDecimal export = calculateFee(basePremium, param.exportRatio, SCALE);
-            BigDecimal exportKeepPoint = calculateFee(basePremium, param.exportKeepPointRatio, SCALE);
-
-            // 5.3 设置费用到对象（通过反射或方法引用简化setter调用）
-            setFeeToOrder(insFeeOrders, param.typePrefix, commission, follow, addThrow, keepPoint, inlet, export, exportKeepPoint);
-
-            // 5.4 累加总应收/应付款
-            totalReceivable = totalReceivable.add(inlet);
-            totalPayable = totalPayable.add(export);
-        }
+        // 关键：获取是否含税标识
+        Integer withTax = ptlAgreement.getWithTax(); // 0-否 1-是
+
+        // 保费
+        BigDecimal jqPremium = insOrdersCosts.getJqPremium() == null ? BigDecimal.ZERO : insOrdersCosts.getJqPremium();
+        BigDecimal syPremium = insOrdersCosts.getSyPremium() == null ? BigDecimal.ZERO : insOrdersCosts.getSyPremium();
+        BigDecimal jyPremium = insOrdersCosts.getJyPremium() == null ? BigDecimal.ZERO : insOrdersCosts.getJyPremium();
+
+        // 从页面获取【新比例】
+        BigDecimal newJqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
+        BigDecimal newSyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
+        BigDecimal newJyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
+
+        BigDecimal newJqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
+        BigDecimal newSyInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
+        BigDecimal newJyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
+
+        BigDecimal newJqFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJqFollowRatio());
+        BigDecimal newSyFollowRatio = covertPercent(ptlAgreementCostRatioVo.getSyFollowRatio());
+        BigDecimal newJyFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJyFollowRatio());
+
+        BigDecimal newJqAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio());
+        BigDecimal newSyAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getSyAdditionalRatio());
+        BigDecimal newJyAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJyAdditionalRatio());
+
+        BigDecimal newJqKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqKeepPointRatio());
+        BigDecimal newSyKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyKeepPointRatio());
+        BigDecimal newJyKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyKeepPointRatio());
+
+        BigDecimal newJqExportRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportRatio());
+        BigDecimal newSyExportRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportRatio());
+        BigDecimal newJyExportRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportRatio());
+
+        BigDecimal newJqExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportKeepPointRatio());
+        BigDecimal newSyExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportKeepPointRatio());
+        BigDecimal newJyExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportKeepPointRatio());
+
+        // 核心：规则重新计算所有费用
+        // 1. 交强险
+        calculatePremiumByRule(insFeeOrders, "jq", jqPremium,
+                newJqCommissionRatio, newJqInletRatio, newJqFollowRatio,
+                newJqAddThrowRatio, newJqKeepPointRatio, newJqExportRatio, newJqExportKeepPointRatio,
+                withTax, TAX_RATE, SCALE);
+
+        // 2. 商业险
+        calculatePremiumByRule(insFeeOrders, "sy", syPremium,
+                newSyCommissionRatio, newSyInletRatio, newSyFollowRatio,
+                newSyAddThrowRatio, newSyKeepPointRatio, newSyExportRatio, newSyExportKeepPointRatio,
+                withTax, TAX_RATE, SCALE);
+
+        // 3. 驾乘险
+        calculatePremiumByRule(insFeeOrders, "jy", jyPremium,
+                newJyCommissionRatio, newJyInletRatio, newJyFollowRatio,
+                newJyAddThrowRatio, newJyKeepPointRatio, newJyExportRatio, newJyExportKeepPointRatio,
+                withTax, TAX_RATE, SCALE);
+
+        // 重新统计总应收、总应付
+        BigDecimal totalPayable = insFeeOrders.getJqPayablePremium().add(insFeeOrders.getSyPayablePremium()).add(insFeeOrders.getJyPayablePremium());
+        BigDecimal totalReceivable = insFeeOrders.getJqReceivablePremium().add(insFeeOrders.getSyReceivablePremium()).add(insFeeOrders.getJyReceivablePremium());
 
-        // 6. 设置总费用、 比例并更新
-        saveRatio(ptlAgreementCostRatioVo,insFeeOrders);
-        insFeeOrders.setTotalReceivablePremium(scale(totalReceivable, SCALE));
         insFeeOrders.setTotalPayablePremium(scale(totalPayable, SCALE));
+        insFeeOrders.setTotalReceivablePremium(scale(totalReceivable, SCALE));
+
+        // 保存比例
+        saveRatio(ptlAgreementCostRatioVo, insFeeOrders);
         this.updateById(insFeeOrders);
         return insFeeOrders;
     }
 
+    /**
+     * 【按你的规则统一计算费用】
+     * withTax=0 → 保费 /1.06
+     * withTax=1 → 直接用保费
+     */
+    private void calculatePremiumByRule(
+            InsFeeOrders insFeeOrders, String type,
+            BigDecimal premium,
+            BigDecimal commissionRatio, BigDecimal inletRatio, BigDecimal followRatio,
+            BigDecimal addThrowRatio, BigDecimal keepPointRatio, BigDecimal exportRatio, BigDecimal exportKeepPointRatio,
+            Integer withTax, BigDecimal taxRate, int scale) {
+
+        // 计算基数
+        BigDecimal base = BigDecimal.ZERO;
+        if (withTax == 0) {
+            // 不含税：保费 / 1.06
+            base = premium.divide(taxRate, scale, RoundingMode.HALF_EVEN);
+        } else {
+            // 含税：直接用保费
+            base = premium;
+        }
+
+        // ===================== 按比例计算各项费用 =====================
+        BigDecimal commission = base.multiply(commissionRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal inlet = base.multiply(inletRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal follow = base.multiply(followRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal addThrow = base.multiply(addThrowRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal keepPoint = base.multiply(keepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal export = base.multiply(exportRatio).setScale(scale, RoundingMode.HALF_EVEN);
+        BigDecimal exportKeepPoint = base.multiply(exportKeepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
+
+        // 赋值到实体（自动匹配 jq / sy / jy）
+        if ("jq".equals(type)) {
+            insFeeOrders.setJqCommissionPremium(commission);
+            insFeeOrders.setJqReceivablePremium(inlet);
+            insFeeOrders.setJqFollowPremium(follow);
+            insFeeOrders.setJqAdditionalPremium(addThrow);
+            insFeeOrders.setJqKeepPointPremium(keepPoint);
+            insFeeOrders.setJqExportPremium(export);
+            insFeeOrders.setJqExportKeepPointPremium(exportKeepPoint);
+            insFeeOrders.setJqPayablePremium(commission);
+        } else if ("sy".equals(type)) {
+            insFeeOrders.setSyCommissionPremium(commission);
+            insFeeOrders.setSyReceivablePremium(inlet);
+            insFeeOrders.setSyFollowPremium(follow);
+            insFeeOrders.setSyAdditionalPremium(addThrow);
+            insFeeOrders.setSyKeepPointPremium(keepPoint);
+            insFeeOrders.setSyExportPremium(export);
+            insFeeOrders.setSyExportKeepPointPremium(exportKeepPoint);
+            insFeeOrders.setSyPayablePremium(commission);
+        } else if ("jy".equals(type)) {
+            insFeeOrders.setJyCommissionPremium(commission);
+            insFeeOrders.setJyReceivablePremium(inlet);
+            insFeeOrders.setJyFollowPremium(follow);
+            insFeeOrders.setJyAdditionalPremium(addThrow);
+            insFeeOrders.setJyKeepPointPremium(keepPoint);
+            insFeeOrders.setJyExportPremium(export);
+            insFeeOrders.setJyExportKeepPointPremium(exportKeepPoint);
+            insFeeOrders.setJyPayablePremium(commission);
+        }
+    }
+
     // 转换百分比
     public BigDecimal covertPercent(BigDecimal ratio) {
         if (ratio == null) {
@@ -249,8 +305,8 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         insFeeOrders.setJyFollowRatio(insFeeOrders.getJyInletRatio().subtract(insFeeOrders.getJyCommissionRatio()));
         // 加投比例
         insFeeOrders.setJqAdditionalRatio(covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio()));
-        insFeeOrders.setSyAdditionalRatio(covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio()));
-        insFeeOrders.setJyAdditionalRatio(covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio()));
+        insFeeOrders.setSyAdditionalRatio(covertPercent(ptlAgreementCostRatioVo.getSyAdditionalRatio()));
+        insFeeOrders.setJyAdditionalRatio(covertPercent(ptlAgreementCostRatioVo.getJyAdditionalRatio()));
         // 留点比例
         insFeeOrders.setJqKeepPointRatio(covertPercent(ptlAgreementCostRatioVo.getJqKeepPointRatio()));
         insFeeOrders.setSyKeepPointRatio(covertPercent(ptlAgreementCostRatioVo.getSyKeepPointRatio()));

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

@@ -204,6 +204,7 @@
         <result property="auditId" column="audit_id" jdbcType="VARCHAR"/>
         <result property="auditName" column="audit_name" jdbcType="VARCHAR"/>
         <result property="errorMessage" column="error_message" jdbcType="VARCHAR"/>
+        <result property="orderType" column="order_type" jdbcType="VARCHAR"/>
         <association property="insOrders" column="{id=id}" select="selectOrdersById"/>
         <association property="carInfoVo" column="{orderNo=id}" select="selectOrdersCarInfoByOrderNo"/>
         <association property="insOrdersOtherInfo" column="{orderNo=id}" select="selectOrdersOtherByOrderNo"/>
@@ -719,7 +720,13 @@
                create_time,
                create_by,
                update_time,
-               update_by
+               update_by,
+                CASE entry_status
+                WHEN 1 THEN '车险出单'
+                WHEN 2 THEN '代客录单'
+                WHEN 3 THEN '补录订单'
+                ELSE ''
+                END AS order_type
         from ins_orders
         where id = #{id}
     </select>

tenant/organization/src/main/resources/application.yml

@@ -57,6 +57,7 @@ tenant:
     - ptl_scheme_insurance_driving_intention
     - ins_business_insurance_option
     - ins_business_insurance
+    - ptl_agreement
     - ptl_agreement_attribution
     - ptl_agreement_dept
     - ptl_agreement_undwrt_rules_attr