Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -244,18 +244,29 @@ public class QuoteVerificationAspect {
         PtlAgreementCostTypeVo jyCostType = getCostTypeByTypeName(costTypeList, "驾意险");
 
 
+
+
         // add by lipf, 2026年6月23日18:32:24 按照财务和田智沟通后的结果，当入口手续费比例大于入口比例的时候，强制设置入口手续费比例为入口比例。
-        BigDecimal jqInlet = BigDecimalUtil.divide(jqCostType.getInlet(), new BigDecimal(100));
-        if(BigDecimalUtil.subtract(jqEntranceFeeRatio,jqInlet).compareTo(BigDecimal.ZERO) >0){
-            jqEntranceFeeRatio = jqInlet;
+        if(Objects.nonNull(jqCostType)){
+            BigDecimal jqInlet = BigDecimalUtil.divide(jqCostType.getInlet(), new BigDecimal(100));
+            if (BigDecimalUtil.subtract(jqEntranceFeeRatio, jqInlet).compareTo(BigDecimal.ZERO) > 0) {
+                jqEntranceFeeRatio = jqInlet;
+            }
         }
-        BigDecimal syInlet = BigDecimalUtil.divide(syCostType.getInlet(), new BigDecimal(100));
-        if(BigDecimalUtil.subtract(syEntranceFeeRatio,syInlet).compareTo(BigDecimal.ZERO) >0){
-            syEntranceFeeRatio = syInlet;
+
+        if(Objects.nonNull(syCostType))
+        {
+            BigDecimal syInlet = BigDecimalUtil.divide(syCostType.getInlet(), new BigDecimal(100));
+            if (BigDecimalUtil.subtract(syEntranceFeeRatio, syInlet).compareTo(BigDecimal.ZERO) > 0) {
+                syEntranceFeeRatio = syInlet;
+            }
         }
-        BigDecimal jyInlet = BigDecimalUtil.divide(jqCostType.getInlet(), new BigDecimal(100));
-        if(BigDecimalUtil.subtract(jyEntranceFeeRatio,jyInlet).compareTo(BigDecimal.ZERO) >0){
-            jyEntranceFeeRatio = jyInlet;
+
+        if(Objects.nonNull(jyCostType)){
+            BigDecimal jyInlet = BigDecimalUtil.divide(jqCostType.getInlet(), new BigDecimal(100));
+            if (BigDecimalUtil.subtract(jyEntranceFeeRatio, jyInlet).compareTo(BigDecimal.ZERO) > 0) {
+                jyEntranceFeeRatio = jyInlet;
+            }
         }
 
         // 4. 计算跟单费比例（入口比例 - 手续费比例）

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

@@ -255,7 +255,7 @@ public class UnifyOrderManager {
         PtlAgreement ptlAgreement = byCompanyId.getData().stream().filter(x -> x.getId().equals(quoteVo.getOrder().getAgreementId())).findFirst().orElse(null);
         if (Objects.isNull(ptlAgreement)) {
             log.info("协议不存在。quoteVo.getOrder().getAgreementId()=[{}]", quoteVo.getOrder().getAgreementId());
-            throw new SystemException("协议不存在");
+            throw new SystemException("当前无调度协议配置，无法确认协议");
         }
         quoteVo.getOrder().setAgreementId(ptlAgreement.getId());
         quoteVo.getOrder().setApiType(ptlAgreement.getApiType());

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

@@ -124,8 +124,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     private SysUserWalletVo buildUserWalletVo(SysDept sysDept, SysUser sysUser, SysUserJzgInfo sysUserJzgInfo, SysUserAccount sysUserAccount) {
         SysUserWalletVo sysUserWalletVo = new SysUserWalletVo();
         sysUserWalletVo.setUserId(sysUser.getId());
-        sysUserWalletVo.setDeptId(sysDept.getId());
-        sysUserWalletVo.setDeptName(sysDept.getName());
+        if(Objects.nonNull(sysDept)) {
+            sysUserWalletVo.setDeptId(sysDept.getId());
+            sysUserWalletVo.setDeptName(sysDept.getName());
+        }
         sysUserWalletVo.setWalletBalance(sysUserAccount.getSumAmountUnpaid());
         List<SysAmountAuditing> sysAmountAuditingList = sysAmountAuditingService
                 .list(new LambdaQueryWrapper<SysAmountAuditing>()