Merge remote-tracking branch 'origin/master'

authentication/src/main/resources/logback-spring.xml

@@ -7,8 +7,17 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.1.250</graylogHost>
-<!--        <graylogHost>172.24.144.227</graylogHost>-->
+        <springProfile name="prod">
+            <graylogHost>172.24.144.227</graylogHost>
+        </springProfile>
+
+        <springProfile name="test">
+            <graylogHost>172.24.144.227</graylogHost>
+        </springProfile>
+
+        <springProfile name="dev">
+            <graylogHost>192.168.1.250</graylogHost>
+        </springProfile>
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>
         <extractStackTrace>true</extractStackTrace>
@@ -16,7 +25,7 @@
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="GRAYLOG"/>
+<!--        <appender-ref ref="GRAYLOG"/>-->
     </root>
 
 </configuration>

partner/src/main/resources/logback-spring.xml

@@ -21,7 +21,6 @@
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>
         <extractStackTrace>true</extractStackTrace>
-        140430201005140048
     </appender>
 
     <root level="INFO">

tenant/costsorrule/src/main/resources/logback-spring.xml

@@ -7,8 +7,17 @@
     </appender>
 
     <appender name="GRAYLOG" class="de.siegmar.logbackgelf.GelfTcpAppender">
-        <graylogHost>192.168.1.250</graylogHost>
-<!--        <graylogHost>172.24.144.227</graylogHost>-->
+        <springProfile name="prod">
+            <graylogHost>172.24.144.227</graylogHost>
+        </springProfile>
+
+        <springProfile name="test">
+            <graylogHost>172.24.144.227</graylogHost>
+        </springProfile>
+
+        <springProfile name="dev">
+            <graylogHost>192.168.1.250</graylogHost>
+        </springProfile>
         <graylogPort>12201</graylogPort>
         <includeMdcData>true</includeMdcData>
         <extractStackTrace>true</extractStackTrace>
@@ -16,7 +25,7 @@
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="GRAYLOG"/>
+<!--        <appender-ref ref="GRAYLOG"/>-->
     </root>
 
 </configuration>

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequestRequest.java

@@ -243,8 +243,17 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
                     }
                 });
             }
+            // 处理机动车损失险的保额
+            if(StringUtils.isNotEmpty(actualValue)){
+                List<KindInfoVo> biRiskInfoVo = quoteVo.getKindInfoVo();
+                for(KindInfoVo kindInfoVo :biRiskInfoVo){
+                    if(kindInfoVo.getKindCode().equals("A")){
+                        kindInfoVo.setAmount(actualValue);
+                    }
+                }
+            }
 
-            this.contract = ContractDTO.build(quoteVo.getCiRiskInfoVo(), quoteVo.getBiRiskInfoVo(), quoteVo.getKindInfoVo(), quoteVo.getInsuredPersonInfo(), isNewEnergy);
+            this.contract = ContractDTO.build(quoteVo.getCiRiskInfoVo(), quoteVo.getBiRiskInfoVo(), quoteVo.getKindInfoVo(), quoteVo.getInsuredPersonInfo(), isNewEnergy,actualValue);
             // 人员
             this.customer = CustomerDTO.build(quoteVo.getPolicyHolderInfo(), quoteVo.getInsuredPersonInfo(), quoteVo.getOwnersInfo(), this.saleInfo.agentCode, this.saleInfo.comCode);
         }
@@ -2011,7 +2020,7 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
             }
 
 
-            private static List<ContractDTO> build(RiskInfoVo ciRiskInfoVo, RiskInfoVo biRiskInfoVo, List<KindInfoVo> kindInfoVo, CustomerInfoVo insuredPersonInfo, boolean isNewEnergy) {
+            private static List<ContractDTO> build(RiskInfoVo ciRiskInfoVo, RiskInfoVo biRiskInfoVo, List<KindInfoVo> kindInfoVo, CustomerInfoVo insuredPersonInfo, boolean isNewEnergy,String actualValue) {
                 List<ContractDTO> contractDTOList = new ArrayList<>();
                 String isAloneCI;
                 String relatedType;

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/build/HuaTaiCrawlerQuoteResultsVoBuild.java

@@ -69,9 +69,9 @@ public class HuaTaiCrawlerQuoteResultsVoBuild {
         quoteResultsVo.getScoreVo().setScoreJson(scoreJson);
 
         //续保标志
-        quoteResultsVo.getScoreVo().setJqRenewal("转入".equals(quoteResponseData.getApplicationdto().getCustombusinesstype_ci()) ? String.valueOf(RenewalEnum.Transfer.getCode()) : quoteResponseData.getApplicationdto().getCustombusinesstype_ci());
+        quoteResultsVo.getScoreVo().setJqRenewal("转入".equals(quoteResponseData.getApplicationdto().getCustombusinesstype_ci()) ? String.valueOf(RenewalEnum.Transfer.getCode()) : String.valueOf(RenewalEnum.Renewal.getCode()));
         if (!ProductsType.PT_0330.getCode().equals(quoteVo.getOrder().getProductId())) {
-            quoteResultsVo.getScoreVo().setSyRenewal("转入".equals(quoteResponseData.getApplicationdto().getCustombusinesstype_bi()) ? String.valueOf(RenewalEnum.Transfer.getCode()) : quoteResponseData.getApplicationdto().getCustombusinesstype_ci());
+            quoteResultsVo.getScoreVo().setSyRenewal("转入".equals(quoteResponseData.getApplicationdto().getCustombusinesstype_bi()) ? String.valueOf(RenewalEnum.Transfer.getCode()) : String.valueOf(RenewalEnum.Renewal.getCode()));
         }
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         return quoteResultsVo;

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

@@ -293,8 +293,8 @@ public class OrderOperationLogAspect {
             logger.info("oldItem=[{}]", JSONUtil.toJsonStr(oldItems));
             logger.info("newItem=[{}]", JSONUtil.toJsonStr(newItems));
 
-            track.setChangeBefore(String.join("\r\n", oldItems));
-            track.setChangeAfter(String.join("\r\n", newItems));
+            track.setChangeBefore(String.join("\n", oldItems));
+            track.setChangeAfter(String.join("\n", newItems));
         }
 
         track.setOrderNo(orderNo);

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

@@ -286,6 +286,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             ordersPolicy.setJyPolicyNo(ordersExternalPolicy.getNoPolicy());
             insOrdersPolicyService.updateByOrderNo(ordersPolicy);
 
+            insFeeAuditService.feeAuditAdd(insOrders,baseController.getSystemCode());
             // 发送订单状态变更消息
             this.orderStatusMessage(insOrders,
                     insOrdersCarInfo, insOrdersCosts,
@@ -940,6 +941,18 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
             insOrdersCostsService.saveOrUpdate(ordersCosts);
 
+            //更新驾意险产品的保费
+            BigDecimal jyPremium = ordersCosts.getJyPremium();
+            List<InsOrdersAccidentalDriving> accidentalDrivingList = insOrdersAccidentalDrivingService
+                    .list(new LambdaQueryWrapper<InsOrdersAccidentalDriving>().eq(InsOrdersAccidentalDriving::getOrderNo, ordersNo));
+            if (CollectionUtil.isNotEmpty(accidentalDrivingList) && jyPremium != null) {
+                // 如果只有一个驾意险产品，直接设置其保费为 niPremium
+                if (accidentalDrivingList.size() == 1) {
+                    accidentalDrivingList.get(0).setAmount(jyPremium.toString());
+                }
+                insOrdersAccidentalDrivingService.updateBatchById(accidentalDrivingList);
+            }
+
             //更新评分
             InsOrdersOther ordersOther = insOrdersOtherService.getOne(new LambdaQueryWrapper<InsOrdersOther>()
                     .eq(InsOrdersOther::getOrderNo, ordersNo));

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -1101,9 +1101,9 @@
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND io.id = #{insOrdersParam.orderNo}
             </if>
-            <if test="insOrdersParam.parentId != null">
-                AND io.parent_id = #{insOrdersParam.parentId}
-            </if>
+<!--            <if test="insOrdersParam.parentId != null">-->
+<!--                AND io.parent_id = #{insOrdersParam.parentId}-->
+<!--            </if>-->
             <if test="insOrdersParam.licenseNo != null and insOrdersParam.licenseNo != ''">
                 AND ioci.license_no = #{insOrdersParam.licenseNo}
             </if>

tenant/organization/src/main/java/com/jzg/organization/aop/OrderOperationLogAspect.java

@@ -169,8 +169,8 @@ public class OrderOperationLogAspect {
                 logger.info("oldItem=[{}]", JSONUtil.toJsonStr(oldItems));
                 logger.info("newItem=[{}]", JSONUtil.toJsonStr(newItems));
 
-                track.setChangeBefore(String.join("\r\n", oldItems));
-                track.setChangeAfter(String.join("\r\n", newItems));
+                track.setChangeBefore(String.join("\n", oldItems));
+                track.setChangeAfter(String.join("\n", newItems));
             }
             track.setResult(JSONUtil.toJsonStr(result));
             InsOrders insOrders = insOrdersClient.getById(orderNo);

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

@@ -166,7 +166,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             }
         }
         //校验驾意险座位数范围不可重复
-        validateDrivingIntentionSeatRange(ptlSchemeInsuranceDrivingIntentionList);
+        if(!ptlSchemeSaveVo.getSchemeType().equals("2")) {
+            validateDrivingIntentionSeatRange(ptlSchemeInsuranceDrivingIntentionList);
+        }
         //清空驾意险信息
         cleanDrivingIntention(ptlSchemeInfoList);
         ptlSchemeInsuranceDrivingIntentionMapper.insertOrUpdate(ptlSchemeInsuranceDrivingIntentionList);