wks 3 anni fa
parent
commit
485f552361

+ 1 - 1
src/main/java/com/ydtech/modules/order/components/ZijinRequestApiComponents.java

@@ -132,7 +132,7 @@ public class ZijinRequestApiComponents {
             throw new SystemException(e.getMessage());
             throw new SystemException(e.getMessage());
         }
         }
 
 
-        // 睡眠一段时间 调用 重新获取缓存中的 header
+        // 睡眠一段时间 调用 重新获取缓存中的 header
         try {
         try {
             Thread.sleep(280);
             Thread.sleep(280);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {

+ 6 - 0
src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerQuoteResponse.java

@@ -3,8 +3,10 @@ package com.ydtech.modules.order.entity.crawler.response;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.springframework.util.ObjectUtils;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -50,6 +52,10 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
     @JsonProperty(value = "tax_arrears")
     @JsonProperty(value = "tax_arrears")
     private List<TaxArrearsDto> taxArrears;
     private List<TaxArrearsDto> taxArrears;
 
 
+    public List<TaxArrearsDto> getTaxArrears() {
+        return ObjectUtils.isEmpty(taxArrears) ? Collections.emptyList() : taxArrears;
+    }
+
     @Data
     @Data
     public static class TaxArrearsDto implements Serializable {
     public static class TaxArrearsDto implements Serializable {
 
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ObjectUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 

+ 1 - 7
src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -51,10 +51,6 @@ import java.util.*;
 @Service
 @Service
 public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
 
-    private final StringRedisTemplate redisTemplate;
-
-    private final ZmQuoteConsumer zmQuoteConsumer;
-
     private final InsAreaCompanyService insAreaCompanyService;
     private final InsAreaCompanyService insAreaCompanyService;
 
 
     private final ZhongmeiRequestComponents zhongmeiRequestComponents;
     private final ZhongmeiRequestComponents zhongmeiRequestComponents;
@@ -69,9 +65,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
 
     private final SysUserService sysUserService;
     private final SysUserService sysUserService;
 
 
-    public ZhongMeiOrderServiceImpl(StringRedisTemplate redisTemplate, ZmQuoteConsumer zmQuoteConsumer, InsAreaCompanyService insAreaCompanyService, ZhongmeiRequestComponents zhongmeiRequestComponents, InsOrdersService insOrdersService, InsTaskImageService insTaskImageService, EsmInsAttributionService esmInsAttributionService, SysUserService sysUserService, EsmInsCompanyService esmInsCompanyService) {
-        this.redisTemplate = redisTemplate;
-        this.zmQuoteConsumer = zmQuoteConsumer;
+    public ZhongMeiOrderServiceImpl(InsAreaCompanyService insAreaCompanyService, ZhongmeiRequestComponents zhongmeiRequestComponents, InsOrdersService insOrdersService, InsTaskImageService insTaskImageService, EsmInsAttributionService esmInsAttributionService, SysUserService sysUserService, EsmInsCompanyService esmInsCompanyService) {
         this.insAreaCompanyService = insAreaCompanyService;
         this.insAreaCompanyService = insAreaCompanyService;
         this.zhongmeiRequestComponents = zhongmeiRequestComponents;
         this.zhongmeiRequestComponents = zhongmeiRequestComponents;
         this.insOrdersService = insOrdersService;
         this.insOrdersService = insOrdersService;