提交 6609f8b8 authored 作者: 艾庆国's avatar 艾庆国

Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

...@@ -30,6 +30,7 @@ import com.clx.performance.model.settle.SettlementPlatformAccount; ...@@ -30,6 +30,7 @@ import com.clx.performance.model.settle.SettlementPlatformAccount;
import com.clx.performance.param.pc.owner.*; import com.clx.performance.param.pc.owner.*;
import com.clx.performance.service.OwnerAccountService; import com.clx.performance.service.OwnerAccountService;
import com.clx.performance.service.PlatformAccountConfigService; import com.clx.performance.service.PlatformAccountConfigService;
import com.clx.performance.service.broker.OrderChildBrokerMqService;
import com.clx.performance.service.settle.SettlementLogService; import com.clx.performance.service.settle.SettlementLogService;
import com.clx.performance.service.settle.SettlementMqHandlerService; import com.clx.performance.service.settle.SettlementMqHandlerService;
import com.clx.performance.service.settle.SettlementOwnerService; import com.clx.performance.service.settle.SettlementOwnerService;
...@@ -99,7 +100,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -99,7 +100,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
private final PlatformAccountConfigService platformAccountConfigService; private final PlatformAccountConfigService platformAccountConfigService;
private final OrderFeign orderFeign; private final OrderFeign orderFeign;
private final BreakContractSettlementOwnerDao breakContractSettlementOwnerDao; private final BreakContractSettlementOwnerDao breakContractSettlementOwnerDao;
private final OrderChildBrokerMqService orderChildBrokerMqService;
@Override @Override
public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) { public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) {
...@@ -892,6 +893,10 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -892,6 +893,10 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
settlementOwnerDao.saveEntity(merge); settlementOwnerDao.saveEntity(merge);
//更新货主运单计费明细 //更新货主运单计费明细
settlementOwnerDetailDao.updateSettlementMerge(settlementNo,settlementNos); settlementOwnerDetailDao.updateSettlementMerge(settlementNo,settlementNos);
List<SettlementOwnerDetail> settlementOwnerDetailList = settlementOwnerDetailDao.getBySettlementNo(settlementNo);
// 发送mq (运单更新)
orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetailList.stream().map(item->item.getChildNo()).collect(Collectors.toList()));
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论