|
|
@@ -31,6 +31,7 @@ import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.modules.esm.service.EsmUserReferrerService;
|
|
|
+import com.ydtech.modules.fee.service.CostsCalcService;
|
|
|
import com.ydtech.modules.fee.service.impl.FeeRuleSchemeServiceImpl;
|
|
|
import com.ydtech.modules.fnc.entity.InsFeeAudit;
|
|
|
import com.ydtech.modules.fnc.service.InsFeeAuditService;
|
|
|
@@ -136,6 +137,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
@Autowired
|
|
|
private SysUserLinkAreaMapper sysUserLinkAreaMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CostsCalcService costsCalcService;
|
|
|
+
|
|
|
|
|
|
public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
|
|
|
SysUserRoleService sysUserRoleService,
|
|
|
@@ -718,6 +722,22 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos =
|
|
|
insAreaCompanyQueryDtos.stream().map(InsOrdersEditingVo.InsAreaCompanyEditingDto::new).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> companyIds = insAreaCompanyEditingDtos.stream().map(x -> x.getCompanyId()).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<InsFeeOrderNew> insFeeOrderNews = insFeeOrderNewService.getInsFeeOrderNewListByCompanyId(companyIds);
|
|
|
+
|
|
|
+ //计算费用
|
|
|
+ insFeeOrderNews.forEach(insFeeOrderNew -> {
|
|
|
+ SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
|
|
|
+ insAreaCompanyEditingDtos.stream().filter(x -> x.getCompanyId().equals(insFeeOrderNew.getInsOrderNo())).findFirst().ifPresent(result -> {
|
|
|
+ result.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
|
|
|
+ result.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
|
|
|
+ result.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
|
|
|
+ });
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
insOrdersEditingVo.setInsAreaCompanyEditingDtos(insAreaCompanyEditingDtos);
|
|
|
return insOrdersEditingVo;
|
|
|
}
|