修改bug

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

@@ -851,25 +851,28 @@ public class QuoteVerificationAspect {
         insFeeOrders.setSyCommissionRatio(convertPercent(agreementInfoVo.getAgreement().getSyEntranceFeeRatio()));
         insFeeOrders.setJyCommissionRatio(convertPercent(agreementInfoVo.getAgreement().getJyEntranceFeeRatio()));
         // 入口比例
-        insFeeOrders.setJqInletRatio(convertPercent(jqCostType.getInlet()));
-        insFeeOrders.setSyInletRatio(convertPercent(syCostType.getInlet()));
-        insFeeOrders.setJyInletRatio(convertPercent(jyCostType.getInlet()));
+        insFeeOrders.setJqInletRatio(jqCostType != null ? convertPercent(jqCostType.getInlet()) : BigDecimal.ZERO);
+        insFeeOrders.setSyInletRatio(syCostType != null ? convertPercent(syCostType.getInlet()) : BigDecimal.ZERO);
+        insFeeOrders.setJyInletRatio(jyCostType != null ? convertPercent(jyCostType.getInlet()) : BigDecimal.ZERO);
         // 跟单比例
-        insFeeOrders.setJqFollowRatio(calculateFollowRatio(jqCostType, agreementInfoVo.getAgreement().getJqEntranceFeeRatio()));
-        insFeeOrders.setSyFollowRatio(calculateFollowRatio(syCostType, agreementInfoVo.getAgreement().getSyEntranceFeeRatio()));
-        insFeeOrders.setJyFollowRatio(calculateFollowRatio(jyCostType, agreementInfoVo.getAgreement().getJyEntranceFeeRatio()));
+        insFeeOrders.setJqFollowRatio(jqCostType != null ?
+                calculateFollowRatio(jqCostType, agreementInfoVo.getAgreement().getJqEntranceFeeRatio()) : BigDecimal.ZERO);
+        insFeeOrders.setSyFollowRatio(syCostType != null ?
+                calculateFollowRatio(syCostType, agreementInfoVo.getAgreement().getSyEntranceFeeRatio()) : BigDecimal.ZERO);
+        insFeeOrders.setJyFollowRatio(jyCostType != null ?
+                calculateFollowRatio(jyCostType, agreementInfoVo.getAgreement().getJyEntranceFeeRatio()) : BigDecimal.ZERO);
         // 加投比例
-        insFeeOrders.setJqAdditionalRatio(convertPercent(jqCostType.getAddThrow()));
-        insFeeOrders.setSyAdditionalRatio(convertPercent(syCostType.getAddThrow()));
-        insFeeOrders.setJyAdditionalRatio(convertPercent(jyCostType.getAddThrow()));
+        insFeeOrders.setJqAdditionalRatio(jqCostType != null ? convertPercent(jqCostType.getAddThrow()) : BigDecimal.ZERO);
+        insFeeOrders.setSyAdditionalRatio(syCostType != null ? convertPercent(syCostType.getAddThrow()) : BigDecimal.ZERO);
+        insFeeOrders.setJyAdditionalRatio(jyCostType != null ? convertPercent(jyCostType.getAddThrow()) : BigDecimal.ZERO);
         // 留点比例
-        insFeeOrders.setJqKeepPointRatio(convertPercent(jqCostType.getKeepPointRatio()));
-        insFeeOrders.setSyKeepPointRatio(convertPercent(syCostType.getKeepPointRatio()));
-        insFeeOrders.setJyKeepPointRatio(convertPercent(jyCostType.getKeepPointRatio()));
+        insFeeOrders.setJqKeepPointRatio(jqCostType != null ? convertPercent(jqCostType.getKeepPointRatio()) : BigDecimal.ZERO);
+        insFeeOrders.setSyKeepPointRatio(syCostType != null ? convertPercent(syCostType.getKeepPointRatio()) : BigDecimal.ZERO);
+        insFeeOrders.setJyKeepPointRatio(jyCostType != null ? convertPercent(jyCostType.getKeepPointRatio()) : BigDecimal.ZERO);
         // 出口比例
-        insFeeOrders.setJqExportRatio(convertPercent(jqCostType.getExport()));
-        insFeeOrders.setSyExportRatio(convertPercent(syCostType.getExport()));
-        insFeeOrders.setJyExportRatio(convertPercent(jyCostType.getExport()));
+        insFeeOrders.setJqExportRatio(jqCostType != null ? convertPercent(jqCostType.getExport()) : BigDecimal.ZERO);
+        insFeeOrders.setSyExportRatio(syCostType != null ? convertPercent(syCostType.getExport()) : BigDecimal.ZERO);
+        insFeeOrders.setJyExportRatio(jyCostType != null ? convertPercent(jyCostType.getExport()) : BigDecimal.ZERO);
     }
 
     /**

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java

@@ -57,7 +57,7 @@ public class YangGuangApiRequestComponent {
         // 处理解密
         String decryptedResponse = yangGuangEncryption.authcodeDecode(body, yangGuangApiProperties.getKey());
 
-        InsuranceLog.infoLog(InsuranceEnum.BPIC.getPinyin(), "\n\t---------> {} \n\t---------> 响应参数:{}", type, decryptedResponse);
+        InsuranceLog.infoLog(InsuranceEnum.YGBX.getPinyin(), "\n\t---------> {} \n\t---------> 响应参数:{}", type, decryptedResponse);
         JSONObject jsonObject = JSON.parseObject(decryptedResponse);
         S t = jsonObject.toJavaObject(tClass);
         // 反序列化响应