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

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -178,6 +178,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
         insPlyIncome.setCreateTime(LocalDate.now());
         insPlyIncome.setDocumentaryFeesStatus("0");
+        insPlyIncome.setInsuredName(order.getInsuredname());
         insPlyIncome.setHandlingFeesStatus("0");
         insPlyIncome.setNoNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
         insPlyIncome.setNoPremium(insFeeOrderNew.getNoPremium());
@@ -1342,8 +1343,11 @@ handlingProportion,
         BigDecimal divisor = new BigDecimal("1.06"); // 示例除数
         // 先进行除法，保留5位小数，不进行四舍五入（使用RoundingMode.DOWN）
         BigDecimal dividedAmount = jqNoTaxPremium.divide(divisor, 5, RoundingMode.DOWN);
-        // 然后进行乘法，这里不需要额外的舍入，因为乘法不会增加小数位数
-       return dividedAmount.multiply(proportion.divide(new BigDecimal(100)));
+        // 将比例除以100，假设proportion是一个百分比值
+        BigDecimal scaledProportion = proportion.divide(new BigDecimal(100));
+        // 然后进行乘法，并进行舍入到5位小数
+        BigDecimal result = dividedAmount.multiply(scaledProportion).setScale(5, RoundingMode.DOWN);
+        return result;
     }
 
     /**
@@ -2108,7 +2112,7 @@ handlingProportion,
             settlementDocumentaryFeesSumEntity.setPartnerCompaniesId(insPlyIncomeVo.getPartnerCompaniesId());
             settlementDocumentaryFeesSumEntity.setCompanyId(insPlyIncomeVo.getCompanyId());
             settlementDocumentaryFeesSumEntity.setCreateTime(new Date());
-            settlementDocumentaryFeesSumEntity.setInvoicId(insPlyIncomeVo.getInvoicId());
+            settlementDocumentaryFeesSumEntity.setInvoicId(insPlyIncomeVo.getContractId());
             settlementDocumentaryFeesSumEntity.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());
             settlementDocumentaryFeesSumEntity.setIsNotCar(insPlyIncomeVo.getIsNotCar());
             settlementDocumentaryFeesSumEntity.setSettlementStatus("1");