Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCosts.java

@@ -35,4 +35,7 @@ public class InsOrdersCosts {
 
     @Schema(description = "商业险优惠比例")
     private BigDecimal syRatio;
+
+    @Schema(description = "总金额，不含车船税")
+    private BigDecimal totalAmount;
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -177,6 +177,9 @@ public class QuoteEchoVo extends QuoteVo {
 
         @Schema(description = "商业险优惠比例")
         private BigDecimal biRatio;
+
+        @Schema(description = "总金额，不含车船税")
+        private BigDecimal totalAmount;
     }
     private OrdersCostsVo costs;
 
@@ -421,6 +424,7 @@ public class QuoteEchoVo extends QuoteVo {
             this.costs.setSumPremium(insOrdersVo.getInsOrdersCosts().getSumPremium());
             this.costs.setCiRatio(insOrdersVo.getInsOrdersCosts().getJqRatio());
             this.costs.setBiRatio(insOrdersVo.getInsOrdersCosts().getSyRatio());
+            this.costs.setTotalAmount(insOrdersVo.getInsOrdersCosts().getTotalAmount());
         }
 
         //保单号信息

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteResultsVo.java

@@ -237,5 +237,9 @@ public class QuoteResultsVo implements Serializable {
          * 总保费
          */
         private String sumPremium;
+        /**
+         * 总金额，不含车船税
+         */
+        private String totalAmount;
     }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
@@ -300,6 +301,13 @@ public class UnifyOrderManager {
                 costs.setNiPremium(formatPremium(costs.getNiPremium()));       // 非车险
                 costs.setVvTax(formatPremium(costs.getVvTax()));               // 车船税
                 costs.setSumPremium(formatPremium(costs.getSumPremium()));     // 总保费
+                if (null != costs.getSumPremium() && null != costs.getVvTax()){
+                    // 总保费，不含车船税
+                    BigDecimal sub = NumberUtil.sub(costs.getSumPremium(), costs.getVvTax());
+                    costs.setTotalAmount(sub.setScale(2, RoundingMode.HALF_UP).toString());
+                }else{
+                    costs.setTotalAmount(formatPremium(costs.getSumPremium()));
+                }
             }
             quoteResultsVo.setQuoteStatus(quoteResultsVo.getQuoteStatusEnum().getCode());
             quoteResultsVo.setOrdersNo(ordersNo);

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

@@ -792,6 +792,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 ordersCosts.setJyPremium(niPremium);
                 ordersCosts.setTaxPremium(vvTax);
                 ordersCosts.setSumPremium(ciPremium.add(biPremium).add(niPremium).add(vvTax));
+                ordersCosts.setTaxPremium(ciPremium.add(biPremium).add(niPremium));
             } else {
                 BigDecimal bigDecimal = new BigDecimal("0.00");
                 ordersCosts.setJqPremium(bigDecimal);

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

@@ -449,6 +449,7 @@
         sy_premium,
         jy_premium,
         sum_premium,
+        total_amount,
         tax_premium,
         jq_ratio,
         sy_ratio

tenant/insurance/quotation-taishan/src/main/java/com/jzg/quotation/taishan/crawler/build/TaiShanCrawlerQuoteRequestVoBuild.java

@@ -25,13 +25,9 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
-import java.util.stream.Collectors;
 
-import com.jzg.quotation.taishan.crawler.properties.TaiShanCrawlerProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.util.UriComponentsBuilder;
 
 @Slf4j
 public class TaiShanCrawlerQuoteRequestVoBuild {

tenant/insurance/quotation-taishan/src/main/java/com/jzg/quotation/taishan/crawler/service/impl/TaiShanCrawlerQuoteProcessServiceImpl.java

@@ -292,11 +292,11 @@ public class TaiShanCrawlerQuoteProcessServiceImpl implements TaiShanCrawlerQuot
         //String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6MTUsImV4cCI6MTc4MTY4NzIzMn0.ldWz9TMY4AJ75VE0Bk1mkzAXPC9jJNMIWL82n0kGHrBwASgGvBxO3fe7orHbCIowt0athoRn1zA9m5ZNnO7olg";
 
         //String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6MTIsImV4cCI6MTc4MTk0MDMyMX0.rsR8yMmSsB5iOstJSToswargqTCFB5He37UydrlK_lKFsHVqtBL-EOAgls4YL4nKWvRtbSxxY6HZRczHFG0iRw";
-        String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6NTQsImV4cCI6MTc4NTQ4MjUwOX0.AbA_jALziOnj6VuKgbsTArbEM3EhmJN1zso7SF8fmqUSuR4VtSj-GNJuOq3P-xFumSyV-BKFAxCxC08Ryjtzxw";
+        //String authorization = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI1ODI0MjEiLCJhdXRoIjoiUk9MRV9CVVNJTkVTUyIsInBhc3N3b3JkX2V4cGlyZSI6NTQsImV4cCI6MTc4NTQ4MjUwOX0.AbA_jALziOnj6VuKgbsTArbEM3EhmJN1zso7SF8fmqUSuR4VtSj-GNJuOq3P-xFumSyV-BKFAxCxC08Ryjtzxw";
 
         // 修复后：从缓存获取
         String token = taiShanCrawlerCacheComponent.getAuthorization(username);
-//        String authorization = "Bearer " + token;
+        String authorization = "Bearer " + token;
         log.info("TaiShan-token：{}", token);
         log.info("TaiShan-authorization：{}", authorization);