|
|
@@ -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);
|