查看详情添加费用信息展示

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

@@ -5,8 +5,11 @@ import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
 import com.ydtech.modules.fee.dto.FeeSchemeResDto;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
+import com.ydtech.modules.order.entity.vo.QueryOrderFeeResultVo;
 import com.ydtech.modules.order.entity.vo.QueryOrderFeeVo;
 
+import java.util.List;
+
 /**
  * 该类中只要包含费用的一些相关接口
  * 跟单费用的获取、跟单费用的拆分等
@@ -27,5 +30,5 @@ public interface FeeRuleSchemeService {
      * @param companyId
      * @return
      */
-    public QueryOrderFeeVo queryFeeOrderInfo(String companyId);
+    public List<QueryOrderFeeResultVo> queryFeeOrderInfo(String companyId);
 }

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

@@ -21,6 +21,7 @@ import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.OrderFeeVo;
+import com.ydtech.modules.order.entity.vo.QueryOrderFeeResultVo;
 import com.ydtech.modules.order.entity.vo.QueryOrderFeeVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsFeeOrderService;
@@ -835,7 +836,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         return premium;
     }
 
-    public QueryOrderFeeVo queryFeeOrderInfo(String companyId){
+    public List<QueryOrderFeeResultVo> queryFeeOrderInfo(String companyId){
         QueryOrderFeeVo queryOrderFeeVo = new QueryOrderFeeVo();
         OrderFeeVo jqOrderFeeVo = new OrderFeeVo();
         OrderFeeVo syOrderFeeVo = new OrderFeeVo();
@@ -844,31 +845,142 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
         InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getInsOrderNo());
 
+        if(insFeeOrder!=null){
+            if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getSyPremium()==null){//当为单交业务时
+                jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+                jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
+                jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+            }else if(insFeeOrder.getJqPremium()==null && insFeeOrder.getSyPremium()!=null){//当为单商业务时
+                syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
+                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
+                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+            }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()));
+                //获取商业险费用明细
+                syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
+                syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
+                syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
 
-        if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getSyPremium()==null){//当为单交业务时
-            jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-            jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
-            jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
-        }else if(insFeeOrder.getJqPremium()==null && insFeeOrder.getSyPremium()!=null){//当为单商业务时
-            syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
-            syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
-            syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
-        }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()));
-            //获取商业险费用明细
-            syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
-            syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
-            syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
-
+            }
+            queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
+            queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
+            queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
         }
-        queryOrderFeeVo.setJqCoderFeeVo(jqOrderFeeVo);
-        queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
-        queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
-        return queryOrderFeeVo;
+        List<QueryOrderFeeResultVo> resultList=convertOrderFeeVoData(queryOrderFeeVo);
+        return resultList;
+    }
+
+    //把取出的费用信息转换为页面需要展示的数据
+    private List<QueryOrderFeeResultVo> convertOrderFeeVoData(QueryOrderFeeVo orderFeeVo) {
+        List<QueryOrderFeeResultVo> resultList=new ArrayList<>();
+        OrderFeeVo jqOrderFeeVo = orderFeeVo.getJqCoderFeeVo();
+        OrderFeeVo syOrderFeeVo = orderFeeVo.getSyCoderFeeVo();
+        OrderFeeVo fcOrderFeeVo = orderFeeVo.getFcCoderFeeVo();
+
+        //总费用
+        QueryOrderFeeResultVo feeResultVo1=new QueryOrderFeeResultVo();
+        feeResultVo1.setDescSerialNo("1");
+        feeResultVo1.setFeeTypeName("总费用");
+        feeResultVo1.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsProportion()!=null?jqOrderFeeVo.getCostsProportion():"-");
+        feeResultVo1.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsPremiums()!=null?jqOrderFeeVo.getCostsPremiums():"-");
+        feeResultVo1.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getCostsProportion()!=null?syOrderFeeVo.getCostsProportion():"-");
+        feeResultVo1.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiums()!=null?syOrderFeeVo.getCostsPremiums():"-");
+        feeResultVo1.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportion()!=null?fcOrderFeeVo.getCostsProportion():"-");
+        feeResultVo1.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiums()!=null?fcOrderFeeVo.getCostsPremiums():"-");
+        resultList.add(feeResultVo1);
+        //一级管理费用
+        QueryOrderFeeResultVo feeResultVo2=new QueryOrderFeeResultVo();
+        feeResultVo2.setDescSerialNo("2");
+        feeResultVo2.setFeeTypeName("一级管理费");
+        feeResultVo2.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getFirstDeptProportion()!=null?jqOrderFeeVo.getFirstDeptProportion():"-");
+        feeResultVo2.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getFirstDeptPremiums()!=null?jqOrderFeeVo.getFirstDeptPremiums():"-");
+        feeResultVo2.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getFirstDeptProportion()!=null?syOrderFeeVo.getFirstDeptProportion():"-");
+        feeResultVo2.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstDeptPremiums()!=null?syOrderFeeVo.getFirstDeptPremiums():"-");
+        feeResultVo2.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptProportion()!=null?fcOrderFeeVo.getFirstDeptProportion():"-");
+        feeResultVo2.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptPremiums()!=null?fcOrderFeeVo.getFirstDeptPremiums():"-");
+        resultList.add(feeResultVo2);
+        //二级管理费用
+        QueryOrderFeeResultVo feeResultVo3=new QueryOrderFeeResultVo();
+        feeResultVo3.setDescSerialNo("3");
+        feeResultVo3.setFeeTypeName("二级管理费");
+        feeResultVo3.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getSecondDeptProportion()!=null?jqOrderFeeVo.getSecondDeptProportion():"-");
+        feeResultVo3.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getSecondDeptPremiums()!=null?jqOrderFeeVo.getSecondDeptPremiums():"-");
+        feeResultVo3.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getSecondDeptProportion()!=null?syOrderFeeVo.getSecondDeptProportion():"-");
+        feeResultVo3.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondDeptPremiums()!=null?syOrderFeeVo.getSecondDeptPremiums():"-");
+        feeResultVo3.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptProportion()!=null?fcOrderFeeVo.getSecondDeptProportion():"-");
+        feeResultVo3.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptPremiums()!=null?fcOrderFeeVo.getSecondDeptPremiums():"-");
+        resultList.add(feeResultVo3);
+        //三级管理费用
+        QueryOrderFeeResultVo feeResultVo4=new QueryOrderFeeResultVo();
+        feeResultVo4.setDescSerialNo("4");
+        feeResultVo4.setFeeTypeName("三级管理费");
+        feeResultVo4.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getThirdDeptProportion()!=null?jqOrderFeeVo.getThirdDeptProportion():"-");
+        feeResultVo4.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getThirdDeptPremiums()!=null?jqOrderFeeVo.getThirdDeptPremiums():"-");
+        feeResultVo4.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getThirdDeptProportion()!=null?syOrderFeeVo.getThirdDeptProportion():"-");
+        feeResultVo4.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdDeptPremiums()!=null?syOrderFeeVo.getThirdDeptPremiums():"-");
+        feeResultVo4.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptProportion()!=null?fcOrderFeeVo.getThirdDeptProportion():"-");
+        feeResultVo4.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptPremiums()!=null?fcOrderFeeVo.getThirdDeptPremiums():"-");
+        resultList.add(feeResultVo4);
+        //四级管理费用
+        QueryOrderFeeResultVo feeResultVo5=new QueryOrderFeeResultVo();
+        feeResultVo5.setDescSerialNo("5");
+        feeResultVo5.setFeeTypeName("四级管理费");
+        feeResultVo5.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getForthDeptProportion()!=null?jqOrderFeeVo.getForthDeptProportion():"-");
+        feeResultVo5.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getForthDeptPremiums()!=null?jqOrderFeeVo.getForthDeptPremiums():"-");
+        feeResultVo5.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getForthDeptProportion()!=null?syOrderFeeVo.getForthDeptProportion():"-");
+        feeResultVo5.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getForthDeptPremiums()!=null?syOrderFeeVo.getForthDeptPremiums():"-");
+        feeResultVo5.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptProportion()!=null?fcOrderFeeVo.getForthDeptProportion():"-");
+        feeResultVo5.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptPremiums()!=null?fcOrderFeeVo.getForthDeptPremiums():"-");
+        resultList.add(feeResultVo5);
+        //五级管理费用
+        QueryOrderFeeResultVo feeResultVo6=new QueryOrderFeeResultVo();
+        feeResultVo6.setDescSerialNo("6");
+        feeResultVo6.setFeeTypeName("五级管理费");
+        feeResultVo6.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getFifthDeptProportion()!=null?jqOrderFeeVo.getFifthDeptProportion():"-");
+        feeResultVo6.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getFifthDeptPremiums()!=null?jqOrderFeeVo.getFifthDeptPremiums():"-");
+        feeResultVo6.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getFifthDeptProportion()!=null?syOrderFeeVo.getFifthDeptProportion():"-");
+        feeResultVo6.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFifthDeptPremiums()!=null?syOrderFeeVo.getFifthDeptPremiums():"-");
+        feeResultVo6.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptProportion()!=null?fcOrderFeeVo.getFifthDeptProportion():"-");
+        feeResultVo6.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptPremiums()!=null?fcOrderFeeVo.getFifthDeptPremiums():"-");
+        resultList.add(feeResultVo6);
+        //一级分销费
+        QueryOrderFeeResultVo feeResultVo7=new QueryOrderFeeResultVo();
+        feeResultVo7.setDescSerialNo("7");
+        feeResultVo7.setFeeTypeName("一级分销费");
+        feeResultVo7.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getFirstRetailProportion()!=null?jqOrderFeeVo.getFirstRetailProportion():"-");
+        feeResultVo7.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getFirstRetailPremiums()!=null?jqOrderFeeVo.getFirstRetailPremiums():"-");
+        feeResultVo7.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getFirstRetailProportion()!=null?syOrderFeeVo.getFirstRetailProportion():"-");
+        feeResultVo7.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstRetailPremiums()!=null?syOrderFeeVo.getFirstRetailPremiums():"-");
+        feeResultVo7.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstRetailProportion()!=null?fcOrderFeeVo.getFirstRetailProportion():"-");
+        feeResultVo7.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstRetailPremiums()!=null?fcOrderFeeVo.getFirstRetailPremiums():"-");
+        resultList.add(feeResultVo7);
+        //二级分销费
+        QueryOrderFeeResultVo feeResultVo8=new QueryOrderFeeResultVo();
+        feeResultVo8.setDescSerialNo("8");
+        feeResultVo8.setFeeTypeName("二级分销费");
+        feeResultVo8.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getSecondRetailProportion()!=null?jqOrderFeeVo.getSecondRetailProportion():"-");
+        feeResultVo8.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getSecondRetailPremiums()!=null?jqOrderFeeVo.getSecondRetailPremiums():"-");
+        feeResultVo8.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getSecondRetailProportion()!=null?syOrderFeeVo.getSecondRetailProportion():"-");
+        feeResultVo8.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondRetailPremiums()!=null?syOrderFeeVo.getSecondRetailPremiums():"-");
+        feeResultVo8.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondRetailProportion()!=null?fcOrderFeeVo.getSecondRetailProportion():"-");
+        feeResultVo8.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondRetailPremiums()!=null?fcOrderFeeVo.getSecondRetailPremiums():"-");
+        resultList.add(feeResultVo8);
+        //三级分销费
+        QueryOrderFeeResultVo feeResultVo9=new QueryOrderFeeResultVo();
+        feeResultVo9.setDescSerialNo("9");
+        feeResultVo9.setFeeTypeName("三级分销费");
+        feeResultVo9.setJqFeeRate(jqOrderFeeVo!=null&&jqOrderFeeVo.getThirdRetailProportion()!=null?jqOrderFeeVo.getThirdRetailProportion():"-");
+        feeResultVo9.setJqFeeAmount(jqOrderFeeVo!=null&&jqOrderFeeVo.getThirdRetailPremiums()!=null?jqOrderFeeVo.getThirdRetailPremiums():"-");
+        feeResultVo9.setSyFeeRate(syOrderFeeVo!=null&&syOrderFeeVo.getThirdRetailProportion()!=null?syOrderFeeVo.getThirdRetailProportion():"-");
+        feeResultVo9.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdRetailPremiums()!=null?syOrderFeeVo.getThirdRetailPremiums():"-");
+        feeResultVo9.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdRetailProportion()!=null?fcOrderFeeVo.getThirdRetailProportion():"-");
+        feeResultVo9.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdRetailPremiums()!=null?fcOrderFeeVo.getThirdRetailPremiums():"-");
+        resultList.add(feeResultVo9);
+        return resultList;
     }
 
     /**

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @TableName(autoResultMap = true)
@@ -331,4 +332,9 @@ public class OrderVo implements Serializable {
      */
     private Object ExtendInfo;
 
+    /**
+     * 费用信息
+     */
+    private List<QueryOrderFeeResultVo> orderFeeResult;
+
 }

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

@@ -0,0 +1,24 @@
+package com.ydtech.modules.order.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryOrderFeeResultVo {
+    @ApiModelProperty("展示顺序-行数，页面使用该字段排序后展示")
+    private String descSerialNo;
+    @ApiModelProperty("费用类型名称")
+    private String feeTypeName;
+    @ApiModelProperty("交强费用比例")
+    private String jqFeeRate;
+    @ApiModelProperty("交强费用金额")
+    private String jqFeeAmount;
+    @ApiModelProperty("商业费用比例")
+    private String syFeeRate;
+    @ApiModelProperty("商业费用金额")
+    private String syFeeAmount;
+    @ApiModelProperty("非车费用比例")
+    private String fcFeeRate;
+    @ApiModelProperty("非车费用金额")
+    private String fcFeeAmount;
+}

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

@@ -16,6 +16,7 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.fee.service.impl.FeeRuleSchemeServiceImpl;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
@@ -28,10 +29,7 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.bo.UnderwritingRulesBo;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.entity.vo.VerifyOrdersVo;
+import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -45,10 +43,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -74,13 +69,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final PtlAgreementService ptlAgreementService;
 
-    public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService, SysDeptService sysDeptService, StringRedisTemplate redisTemplate, @Lazy InsAreaCompanyService insAreaCompanyService, PtlAgreementService ptlAgreementService) {
+    private final FeeRuleSchemeServiceImpl feeRuleSchemeService;
+
+    public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService, SysDeptService sysDeptService, StringRedisTemplate redisTemplate, @Lazy InsAreaCompanyService insAreaCompanyService, PtlAgreementService ptlAgreementService,@Lazy FeeRuleSchemeServiceImpl feeRuleSchemeService) {
         this.orderComponents = orderComponents;
         this.sysUserService = sysUserService;
         this.sysDeptService = sysDeptService;
         this.redisTemplate = redisTemplate;
         this.insAreaCompanyService = insAreaCompanyService;
         this.ptlAgreementService = ptlAgreementService;
+        this.feeRuleSchemeService=feeRuleSchemeService;
     }
 
     @Override
@@ -261,6 +259,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         orderAndAreaCompany.setReptxt(null);
 
+        //新增费用明细信息
+        List<QueryOrderFeeResultVo> orderFeeVoList= feeRuleSchemeService.queryFeeOrderInfo(companyId);
+        if(!orderFeeVoList.isEmpty()){
+            orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
+        }
         //add 解决返回null页面错误  lig 2023-09-14
         if (null == orderAndAreaCompany.getExtendInfo()) orderAndAreaCompany.setExtendInfo("");
         if (null == orderAndAreaCompany.getCrossInsurance())