问题处理

hx-mail/src/main/java/com/fjhx/mail/util/MailHttpUtil.java

@@ -8,13 +8,13 @@ public class MailHttpUtil {
 
     public static void userLogin(Long userId) {
         if (StrUtil.isNotBlank(MailServiceConfig.urlPrefix)) {
-            HttpUtil.get(MailServiceConfig.urlPrefix + "userLogin/" + userId);
+            HttpUtil.get(MailServiceConfig.urlPrefix + "userLogin/" + userId, 30000);
         }
     }
 
     public static void abroadUserLogin(Long userId) {
         if (StrUtil.isNotBlank(MailServiceConfig.abroadUrlPrefix)) {
-            HttpUtil.get(MailServiceConfig.abroadUrlPrefix + "userLogin/" + userId);
+            HttpUtil.get(MailServiceConfig.abroadUrlPrefix + "userLogin/" + userId, 30000);
         }
     }
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -15,9 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.controller.utils.DateUtils;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
-import com.fjhx.account.service.account.AccountManagementService;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
-import com.fjhx.account.service.tax.TaxRefundDetailsService;
 import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
@@ -25,7 +23,6 @@ import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.currency.po.CurrencyRate;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.FlowStatusEnum1;
-import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.currency.CurrencyRateService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
@@ -45,7 +42,6 @@ import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.entity.quality.po.QualityDetail;
 import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.quality.QualityDetailService;
@@ -71,8 +67,6 @@ import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.contract.ContractShipmentService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
-import com.fjhx.sale.service.purchase.EhsdPurchaseService;
-import com.fjhx.sale.service.statement.SaleStatementService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
@@ -100,8 +94,6 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
@@ -121,10 +113,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public static final int VALUE = 20;
     private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MMM/yyyy", Locale.ENGLISH);
 
-    //    @Qualifier(ThreadPoolConfig.threadPoolTaskExecutor)
-//    @Autowired
-//    private ThreadPoolExecutor threadPoolExecutor;
-    private ExecutorService threadPoolExecutor = Executors.newCachedThreadPool();
+    @Qualifier(ThreadPoolConfig.threadPoolTaskExecutor)
+    @Autowired
+    private ThreadPoolExecutor threadPoolExecutor;
 
     @Autowired
     private CustomerService customerService;
@@ -139,12 +130,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private ProductInfoService productInfoService;
 
     @Autowired
-    private AccountManagementService accountManagementService;
-
-    @Autowired
-    private EhsdPurchaseService ehsdPurchaseService;
-
-    @Autowired
     private EhsdPurchaseProductService ehsdPurchaseProductService;
 
     @Autowired
@@ -157,9 +142,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private ClaimContractService claimContractService;
 
     @Autowired
-    private TaxRefundDetailsService taxRefundDetailsService;
-
-    @Autowired
     private AccountRequestFundsDetailService accountRequestFundsDetailService;
 
     @Autowired
@@ -172,9 +154,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private PurchaseService purchaseService;
 
     @Autowired
-    private PayDetailService payDetailService;
-
-    @Autowired
     private ArrivalDetailService arrivalDetailService;
 
     @Autowired
@@ -189,12 +168,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private DictTenantDataService dictTenantDataService;
 
-    @Autowired
-    private CodingRuleService codingRuleService;
-
-    @Autowired
-    private SaleStatementService saleStatementService;
-
     /**
      * 分页
      *