手续费比例展示

src/main/java/com/ydtech/modules/fee/service/FeeRuleSchemeService.java

@@ -30,5 +30,7 @@ public interface FeeRuleSchemeService {
      * @param companyId
      * @return
      */
-    public List<QueryOrderFeeResultVo> queryFeeOrderInfo(String companyId);
+    public QueryOrderFeeVo queryFeeOrderInfo(String companyId);
+
+    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo);
 }

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1267,12 +1267,13 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         return premium;
     }
 
-    public List<QueryOrderFeeResultVo> queryFeeOrderInfo(String companyId){
+    public QueryOrderFeeVo queryFeeOrderInfo(String companyId){
         QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
         OrderFeeVo jqOrderFeeVo = new OrderFeeVo();
         OrderFeeVo syOrderFeeVo = new OrderFeeVo();
         OrderFeeVo fcOrderFeeVo = new OrderFeeVo();
-
+        BigDecimal jqFeePremium = new BigDecimal(0);
+        BigDecimal syFeePremium = new BigDecimal(0);
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
         InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getId());
 
@@ -1281,32 +1282,37 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
                 jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
                 jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+                jqFeePremium = insFeeOrder.getJqCostsPremiums();
             }else if(insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0  && insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()==0){//当为单商业务时
                 syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
                 syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
                 syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+                syFeePremium = insFeeOrder.getSyCostsPremiums();
             }else if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()>0 && insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0){//当为交商业务时
                 QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
                 //获取交强险费用明细
                 jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
                 jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
                 jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+                jqFeePremium = insFeeOrder.getJqCostsPremiums();
                 //获取商业险费用明细
                 syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
                 syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
                 syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+                syFeePremium = insFeeOrder.getSyCostsPremiums();
 
             }
+            BigDecimal totallFeePremium = jqFeePremium.add(syFeePremium);
             queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
             queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
             queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
+            queryOrderFeeVo.setTotalFeePremium(totallFeePremium.toString());
         }
-        List<QueryOrderFeeResultVo> resultList=convertOrderFeeVoData(queryOrderFeeVo);
-        return resultList;
+        return queryOrderFeeVo;
     }
 
     //把取出的费用信息转换为页面需要展示的数据
-    private List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo) {
+    public List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo) {
         List<QueryOrderFeeResultVo> resultList=new ArrayList<>();
         OrderFeeVo jqOrderFeeVo = orderFeeVo.getJqCoderFeeVo();
         OrderFeeVo syOrderFeeVo = orderFeeVo.getSyCoderFeeVo();

src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -341,4 +341,9 @@ public class OrderVo implements Serializable {
      */
     private List<QueryOrderFeeResultVo> orderFeeResult;
 
+    /**
+     * 单条费用信息
+     */
+    private QueryOrderFeeVo queryOrderFeeVo;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/QueryOrderFeeVo.java

@@ -20,6 +20,8 @@ public class QueryOrderFeeVo implements Serializable {
     private OrderFeeVo syCoderFeeVo;
     @JsonProperty("fcCoderFeeVo")
     private OrderFeeVo fcCoderFeeVo;
+    @JsonProperty("totalFeePremium")
+    private String totalFeePremium;
 
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -343,7 +343,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         orderAndAreaCompany.setReptxt(null);
 
         //新增费用明细信息
-        List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.queryFeeOrderInfo(companyId);
+        QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
+        orderAndAreaCompany.setQueryOrderFeeVo(queryOrderFeeVo);
+        List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
         if (!orderFeeVoList.isEmpty()) {
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
         }