diff --git a/performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java b/performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java index 290f2f50865e85e54e68a8626f17becc989c53b4..ea9cd537e91361cca0a815f7184273558a85e73d 100644 --- a/performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java +++ b/performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDaoImpl.java @@ -35,6 +35,16 @@ public class SettlementDriverDaoImpl extends BaseDaoImpl<SettlementDriverMapper, ); } + @Override + public boolean updateInvoiceCompany(SettlementDriver item) { + return update(lUdWrapper() + .eq(SettlementDriver::getId, item.getId()) + .set(SettlementDriver::getInvoicingCompanyId, item.getInvoicingCompanyId()) + .set(SettlementDriver::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName()) + .set(SettlementDriver::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode()) + ); + } + @Override public Optional<SettlementDriver> findBySettlementNo(String settlementNo) { return Optional.of(lQrWrapper() diff --git a/performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java b/performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java index 5fafc92ae061fb88dacb9f8a5564963ec5c7d9cc..b973472919faafac19eb83fab62a4dba5af02ba7 100644 --- a/performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java +++ b/performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java @@ -20,6 +20,8 @@ public interface SettlementDriverDao extends BaseDao<SettlementDriverMapper, Set boolean updatePayStatus(SettlementDriver item); + boolean updateInvoiceCompany(SettlementDriver item); + Optional<SettlementDriver> findBySettlementNo(String settlementNo); Optional<SettlementDriver> findByChildNo(String childNo); diff --git a/performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java b/performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java index e6116fe23ee159541725cc86df456962764f55eb..421f218949705db62cf627ce540e6536acdc107d 100644 --- a/performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java +++ b/performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java @@ -1020,7 +1020,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao .getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); - + SettlementDriver settlementDriver = settlementDriverDao + .getByChildNo(childNo).orNull(); OrderChild orderChild = orderChildDao .getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND); @@ -1061,6 +1062,13 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail); settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail); + if (settlementDriver != null) { + settlementDriver.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId()); + settlementDriver.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName()); + settlementDriver.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode()); + settlementDriverDao.updateInvoiceCompany(settlementDriver); + } + if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){ // 缃戣繍鍗曡浆鏅€氬崟 orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, settlementOwnerDetail.getInvoiceType(), null);