提交 74facd60 authored 作者: jiangwenye's avatar jiangwenye

Merge branch 'v11.1_plat_acc_config_20240125' of…

Merge branch 'v11.1_plat_acc_config_20240125' of https://t.clxkj.cn/clx-java/clx-performance into test Former-commit-id: ff5a2510
...@@ -198,14 +198,13 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -198,14 +198,13 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
//返回对象 //返回对象
SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO(); SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
SettlementOwner settlementOwner = settlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); SettlementOwner settlementOwner = settlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(settlementOwner.getOrderNo());
List<CarrierPagePlatformAccountConfigVO> configs = List<CarrierPagePlatformAccountConfigVO> configs =
platformAccountConfigService.getPlatformAccountConfigByType( platformAccountConfigService.getPlatformAccountConfigByType(
PlatformAccountConfigEnum.BusinessType.SETTLE.getCode(), PlatformAccountConfigEnum.BusinessType.SETTLE.getCode(),
PlatformAccountConfigEnum.OwnerType.COMPANY.getCode(), PlatformAccountConfigEnum.OwnerType.COMPANY.getCode(),
settlementOwner.getInvoiceType(), settlementOwner.getInvoiceType(),
orderInfoFeign.getInvoicingCompanyId(), settlementOwner.getInvoicingCompanyId(),
PlatformAccountConfigEnum.ConfigRange.COLLECTION.getCode()); PlatformAccountConfigEnum.ConfigRange.COLLECTION.getCode());
if(CollectionUtils.isEmpty(configs)){ if(CollectionUtils.isEmpty(configs)){
throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_IS_NULL); throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_IS_NULL);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论