From 3c8ed575db70e0b995c7ee541ff3753ee8b57d87 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 31 三月 2026 11:11:09 +0800
Subject: [PATCH] 导出应收费用对账单
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteFeeServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteFeeServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteFeeServiceImpl.java
index 18e63fd..876a181 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteFeeServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsQuoteFeeServiceImpl.java
@@ -7,7 +7,8 @@
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
-import com.ruoyi.tms.domain.TmsDispatchOrder;
+import com.ruoyi.tms.domain.*;
+import com.ruoyi.tms.mapper.*;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -19,8 +20,6 @@
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.core.service.BaseService;
-import com.ruoyi.tms.mapper.TmsQuoteFeeMapper;
-import com.ruoyi.tms.domain.TmsQuoteFee;
import com.ruoyi.tms.service.ITmsQuoteFeeService;
import com.ruoyi.common.core.text.Convert;
@@ -37,8 +36,15 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private TmsQuoteFeeMapper tmsQuoteFeeMapper;
+ @Resource
+ private TmsDispatchOrderMapper tmsDispatchOrderMapper;
-
+ @Resource
+ private TmsServiceProviderMapper tmsServiceProviderMapper;
+ @Resource
+ private TmsCustomsServiceProviderMapper tmsCustomsServiceProviderMapper;
+ @Resource
+ private TmsLoadingServiceProviderMapper tmsLoadingServiceProviderMapper;
/**
* 鏌ヨ鎶ヤ环璐圭敤
*
@@ -116,7 +122,7 @@
if (quoteFeeItems != null && !quoteFeeItems.isEmpty()){
quoteFeeItems.forEach(quoteFeeItem -> {
quoteFeeItem.setDispatchId(dispatchOrder.getId());
- if (quoteFeeItem.getIsYF() == 0){
+ if (quoteFeeItem.getIsYF()!=null &"eFeeItem.getIsYF() == 0){
quoteFeeItem.setYfCount(null);
quoteFeeItem.setYfPrice(null);
quoteFeeItem.setYfSum(null);
@@ -125,6 +131,15 @@
quoteFeeItem.setIsCZYF(null);
quoteFeeItem.setServiceProviderId(null);
quoteFeeItem.setServiceProviderType(null);
+ }
+ if (quoteFeeItem.getIsYF()!=null && quoteFeeItem.getIsYF() == 1
+ && "22".equals(quoteFeeItem.getFree())){
+ // 鏃犵紳璐圭敤
+ TmsDispatchOrder tmsDispatchOrder = new TmsDispatchOrder();
+ tmsDispatchOrder.setId(dispatchOrder.getId());
+ tmsDispatchOrder.setSeamlessSupplierId(quoteFeeItem.getServiceProviderId());
+ tmsDispatchOrder.setSeamlessSupplierName(getServiceProviderName(quoteFeeItem.getServiceProviderType(),quoteFeeItem.getServiceProviderId()));
+ tmsDispatchOrderMapper.updateById(tmsDispatchOrder);
}
TmsQuoteFee tmsQuoteFee = tmsQuoteFeeMapper.selectOne(new LambdaQueryWrapper<>(TmsQuoteFee.class)
@@ -143,6 +158,19 @@
}
return 1;
}
+ public String getServiceProviderName(String serviceProviderType,Integer serviceProviderId){
+ if ("0".equals(serviceProviderType)){
+ TmsServiceProvider tmsServiceProvider = tmsServiceProviderMapper.selectTmsServiceProviderById(serviceProviderId);
+ return tmsServiceProvider.getServiceName();
+ } else if ("1".equals(serviceProviderType)){
+ TmsCustomsServiceProvider tmsCustomsServiceProvider = tmsCustomsServiceProviderMapper.selectTmsCustomsServiceProviderById(serviceProviderId);
+ return tmsCustomsServiceProvider.getServiceName();
+ } else if ("2".equals(serviceProviderType)){
+ TmsLoadingServiceProvider tmsLoadingServiceProvider = tmsLoadingServiceProviderMapper.selectTmsLoadingServiceProviderById(serviceProviderId);
+ return tmsLoadingServiceProvider.getServiceName();
+ }
+ return null;
+ }
/**
* 鏂板鎶ヤ环璐圭敤[鎵归噺]
--
Gitblit v1.8.0