非现询费用计算BUG

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

@@ -1596,7 +1596,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
         //出口配置
         PtlAgreementProductCostsExport ptlAgreementProductCostsExport =
-                ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, ptlAgreementProductCostsNew.getId()));
+                ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>()
+                        .eq(PtlAgreementProductCostsExport::getCostsId, ptlAgreementProductCostsNew.getId()));
 
         //不含税
         BigDecimal bigDecimal = new BigDecimal("1.06");

src/main/java/com/ydtech/modules/order/controller/ExternalOrderController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static com.ydtech.modules.base.model.vo.PageVo.buildPageRequest;
 
@@ -252,7 +253,11 @@ public class ExternalOrderController {
         if(inquiryNowFeeList == null || inquiryNowFeeList.size()==0){
             throw new SystemException("不存在非现询费用");
         }else{
-            noInquiryNowFee = inquiryNowFeeList.get(0);
+            List<PtlAgreementProductCostsNew> collect = inquiryNowFeeList.stream().filter(x -> x.getId().equals(externalOrderFeeVo.getCostId())).collect(Collectors.toList());
+            if(collect.isEmpty()){
+                throw new SystemException("不存在现询费用");
+            }
+            noInquiryNowFee = collect.get(0);
         }
         externalOrderFeeVo.blank();
         ExternalOrderFeeVo resultExternalOrderFeeVo = feeRuleSchemeNewService.calcCostsExternalExportData(ptlAgreement, noInquiryNowFee, externalOrderFeeVo);