Merge remote-tracking branch 'origin/master'

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

@@ -32,5 +32,6 @@ public class SysVersionVo extends PageRequest {
 
     private String issueFlag;
 
+    private String  packageType;
 
 }

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

@@ -346,7 +346,6 @@ public class OrderOperationLogAspect {
         );
         // 执行提取
         Map<String, Object> extracted = fieldExtractor.extractFields(result, mappings);
-        UnderwritingResultsVo res = JSON.parseObject(JSON.toJSONString(extracted.get("data"))).toJavaObject(UnderwritingResultsVo.class);
         InsOrders insOrders = orderService.getById(orderId);
         InsOrdersCarInfo carInfo = carInfoService.getByOrderId(insOrders.getId());
         InsOrdersTrack track = new InsOrdersTrack();
@@ -377,6 +376,7 @@ public class OrderOperationLogAspect {
             pamentTrack.setResult("调用接口获取订单支付码并生成掌柜支付码");
             traceService.save(pamentTrack);
         }else{
+            UnderwritingResultsVo res = JSON.parseObject(JSON.toJSONString(extracted.get("data"))).toJavaObject(UnderwritingResultsVo.class);
             track.setStatus(QuoteNumberConstant.QuoteResult.FAIL.getCode());
             track.setResult(res.getUnderwritingResult());
             InsOrderStatusEnum orderStatusEnum = InsOrderStatusEnum.matchKey(insOrders.getOrderStatus());

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

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

tenant/organization/src/main/resources/mapper/SysVersionMapper.xml

@@ -20,6 +20,9 @@
         <if test="sysVersionVo.appName != null and sysVersionVo.appName != ''">
             and sv.appname = #{sysVersionVo.appName}
         </if>
+        <if test="sysVersionVo.packageType != null and sysVersionVo.packageType != ''">
+            and sv.package_type = #{sysVersionVo.packageType}
+        </if>
         <if test="sysVersionVo.appId != null and sysVersionVo.appId != ''">
             and sv.appid = #{sysVersionVo.appId}
         </if>