中煤修改

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

@@ -112,13 +112,13 @@ public class InsFeeOrdersVo {
         this.jyPayablePremium = insFeeOrders.getJyPayablePremium().toString();
         this.totalPayablePremium = insFeeOrders.getTotalPayablePremium().toString();
         this.jqCommissionPremium = insFeeOrders.getJqCommissionPremium().toString();
-        this.syCommissionPremium = insFeeOrders.getSyCommissionPremium().toString();
-        this.jyCommissionPremium = insFeeOrders.getJyCommissionPremium().toString();
-        this.jqFollowPremium = insFeeOrders.getJqFollowPremium().toString();
-        this.syFollowPremium = insFeeOrders.getSyFollowPremium().toString();
-        this.jyFollowPremium = insFeeOrders.getJyFollowPremium().toString();
-        this.jqAdditionalPremium = insFeeOrders.getJqAdditionalPremium().toString();
-        this.syAdditionalPremium = insFeeOrders.getSyAdditionalPremium().toString();
-        this.jyAdditionalPremium = insFeeOrders.getJyAdditionalPremium().toString();
+        this.syCommissionPremium = insFeeOrders.getSyCommissionPremium() != null ? insFeeOrders.getSyCommissionPremium().toString() : "0.00";
+        this.jyCommissionPremium = insFeeOrders.getJyCommissionPremium() != null ? insFeeOrders.getJyCommissionPremium().toString() : "0.00";
+        this.jqFollowPremium = insFeeOrders.getJqFollowPremium() != null ? insFeeOrders.getJqFollowPremium().toString() : "0.00";
+        this.syFollowPremium = insFeeOrders.getSyFollowPremium() != null ? insFeeOrders.getSyFollowPremium().toString() : "0.00";
+        this.jyFollowPremium = insFeeOrders.getJyFollowPremium() != null ? insFeeOrders.getJyFollowPremium().toString() : "0.00";
+        this.jqAdditionalPremium = insFeeOrders.getJqAdditionalPremium() != null  ? insFeeOrders.getJqAdditionalPremium().toString() : "0.00";
+        this.syAdditionalPremium = insFeeOrders.getSyAdditionalPremium() != null ? insFeeOrders.getSyAdditionalPremium().toString() : "0.00";
+        this.jyAdditionalPremium = insFeeOrders.getJyAdditionalPremium() != null ? insFeeOrders.getJyAdditionalPremium().toString() : "0.00";
     }
 }

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

@@ -1048,11 +1048,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //更新保单号
         InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(orderNo);
         if(Objects.nonNull(orderStatusResultVo.getJqPolicyno())) {
-            insOrdersPolicy.setJyPolicyNo(orderStatusResultVo.getJyPolicyno());
+            insOrdersPolicy.setJqPolicyNo(orderStatusResultVo.getJqPolicyno());
         }
         if(Objects.nonNull(orderStatusResultVo.getSyPolicyno())) {
             insOrdersPolicy.setSyPolicyNo(orderStatusResultVo.getSyPolicyno());
         }
+
+        if(Objects.nonNull(orderStatusResultVo.getJyPolicyno())) {
+            insOrdersPolicy.setJyPolicyNo(orderStatusResultVo.getJyPolicyno());
+        }
         insOrdersPolicyService.updateById(insOrdersPolicy);
 
         //更新支付连接

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/state/listener/OrderStateListener.java

@@ -199,6 +199,10 @@ public class OrderStateListener {
                     stateResult = this.auditSuccess(currentStatus);
                 }
             }
+            // 支付成功
+            case UNDERWRITED -> {
+                stateResult = this.underwrited(currentStatus);
+            }
             default -> {
                 stateResult.setResult(false);
             }

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/entity/request/QuotedPriceRequest.java

@@ -272,6 +272,23 @@ public class QuotedPriceRequest extends BaseRequest {
                 @JsonProperty("motorSubType")
                 private String motorSubType;
 
+                /**
+                 * 车身颜色
+                 * 01 黑
+                 * 02 白
+                 * 03 红
+                 * 04 灰
+                 * 05 蓝
+                 * 06 绿
+                 * 07 黄
+                 * 08 粉
+                 * 09 紫
+                 * 10 棕
+                 * 99 其他
+                 */
+                @JsonProperty("colorCode")
+                private String colorCode;
+
 
                 public PolicyCarDTO(CarInfoVo carInfoVo) {
                     this.engine = carInfoVo.getEngineNo();
@@ -292,6 +309,7 @@ public class QuotedPriceRequest extends BaseRequest {
                     this.registerDate = carInfoVo.getRegisterDate() + " " + TimeConstants.START_TIME;
                     this.issueDate = carInfoVo.getIssueDate() + " " + TimeConstants.START_TIME;
                     this.plateColorCode = "01";
+                    this.colorCode = "01";
                     this.carCheckStatus = null;
 //                    MotorMainTypeEnum motorMainTypeEnum = MotorMainTypeEnum.valueOf("MM_" + carInfoVo.getCarKindCode());
 //                    AssertionUtils.isEmpty(motorMainTypeEnum, "车辆种类输入错误");

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java

@@ -213,7 +213,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
     @Transactional
     public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) {
         OrderBase orderBase = underwritingVo.getOrder();
-        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
+        String url = getApiUrl(orderBase.getInsuranceCompanyId());
         //获取配置信息
         ZmApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmApiConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
 
@@ -273,7 +273,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
     @Override
     public PaymentLinkResultsVo getPaymentLink(PaymentLinkVo paymentLinkVo) throws JsonProcessingException {
         OrderBase orderBase = paymentLinkVo.getOrder();
-        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
+        String url = getApiUrl(orderBase.getInsuranceCompanyId());
         ZmApiOrder zmApiOrder = zhongmeiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         String payUrl = zmApiOrder.getPayUrl();
         //如果mongodb中没有支付链接，说明是人工审核，需要调用核保状态查询接口
@@ -298,7 +298,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
     @Override
     public void uploadImage(InsuranceUploadImageVo insuranceUploadImageVo) {
         OrderBase orderBase = insuranceUploadImageVo.getOrder();
-        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
+        String url = getApiUrl(orderBase.getInsuranceCompanyId());
         //获取配置信息
         AttributionInformationVo attributionInformationVo = orderBase.getAttributionInformationVo();
         ZmApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmApiConfigureParameters.class, attributionInformationVo.getConfigInfo());
@@ -320,7 +320,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
     public DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo downloadPolicyVo) {
         //获取配置信息
         OrderBase orderBase = downloadPolicyVo.getOrder();
-        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
+        String url = getApiUrl(orderBase.getInsuranceCompanyId());
         AttributionInformationVo attributionInformationVo = orderBase.getAttributionInformationVo();
         ZmApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmApiConfigureParameters.class, attributionInformationVo.getConfigInfo());
         DownloadPolicyResultVo downloadPolicyResultVo = new DownloadPolicyResultVo();
@@ -384,7 +384,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
         //获取配置信息
         OrderBase orderBase = orderStatusVo.getOrder();
-        String url = getApiUrl(orderBase.getInsuranceCompanyCode());
+        String url = getApiUrl(orderBase.getInsuranceCompanyId());
         OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
 
         AttributionInformationVo attributionInformationVo = orderBase.getAttributionInformationVo();