Browse Source

修改bug:
订单审核,总金额这里不应该加车船税

jiakai 2 months ago
parent
commit
79e63294b0

+ 3 - 0
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;
 }

+ 4 - 0
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;
     }
 }

+ 8 - 0
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);

+ 1 - 0
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);