Merge remote-tracking branch 'origin/master'

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/service/impl/InsOrdersServiceImpl.java

@@ -940,6 +940,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));