Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
25c7b28f 1 parent 9616f51c

PI-11-HS CODE接口-01： 

参数调整
mt
2023年3月6日11:28:38
Inline Side-by-side
Showing 14 changed files with 22 additions and 26 deletions
...@@ -2,4 +2,12 @@ ALTER TABLE T_ICLEAR_API_APPINFO ...@@ -2,4 +2,12 @@ ALTER TABLE T_ICLEAR_API_APPINFO
2 ADD C_CODE_CHECK VARCHAR(1) 2 ADD C_CODE_CHECK VARCHAR(1)
3 3
4 EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'C类校验是否校验运单号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_ICLEAR_API_APPINFO', @level2type=N'COLUMN',@level2name=N'C_CODE_CHECK' 4 EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'C类校验是否校验运单号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'T_ICLEAR_API_APPINFO', @level2type=N'COLUMN',@level2name=N'C_CODE_CHECK'
5 +GO
6 +
7 +/****** 创建hscode表索引 ******/
8 +CREATE NONCLUSTERED INDEX [nci_wi_T_CC_HS_CODE_SKU_CODE_SKUNAME] ON T_CC_HS_CODE
9 +(
10 + SKU_CODE ASC,
11 + SKUNAME ASC
12 +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
5 GO 13 GO
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.erry.iclear.dateInterface.api; 1 package com.erry.iclear.dateInterface.api;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.response.ResultRS; 4 import com.erry.iclear.dateInterface.api.response.ResultRS;
5 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.erry.iclear.dateInterface.api; 1 package com.erry.iclear.dateInterface.api;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.request.Mawb; 4 import com.erry.iclear.dateInterface.api.request.Mawb;
5 import com.erry.iclear.dateInterface.api.response.ResultRS; 5 import com.erry.iclear.dateInterface.api.response.ResultRS;
6 import com.erry.iclear.dateInterface.entity.IClearApiLog; 6 import com.erry.iclear.dateInterface.entity.IClearApiLog;
......
1 package com.erry.iclear.dateInterface.api; 1 package com.erry.iclear.dateInterface.api;
2 2
3 3
4 -import com.arronlong.httpclientutil.HttpClientUtil;
5 -import com.arronlong.httpclientutil.common.HttpConfig;
6 -import com.arronlong.httpclientutil.common.HttpHeader;
7 import com.arronlong.httpclientutil.exception.HttpProcessException; 4 import com.arronlong.httpclientutil.exception.HttpProcessException;
8 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 5 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
9 import com.erry.iclear.dateInterface.api.request.*; 6 import com.erry.iclear.dateInterface.api.request.*;
10 import com.erry.iclear.dateInterface.api.response.FedexResultChmRS; 7 import com.erry.iclear.dateInterface.api.response.FedexResultChmRS;
11 import com.erry.iclear.dateInterface.api.response.FedexResultRS; 8 import com.erry.iclear.dateInterface.api.response.FedexResultRS;
...@@ -21,11 +18,9 @@ import com.erry.iclear.dateInterface.util.StringUtil; ...@@ -21,11 +18,9 @@ import com.erry.iclear.dateInterface.util.StringUtil;
21 import com.google.gson.Gson; 18 import com.google.gson.Gson;
22 import io.swagger.annotations.ApiOperation; 19 import io.swagger.annotations.ApiOperation;
23 import lombok.extern.slf4j.Slf4j; 20 import lombok.extern.slf4j.Slf4j;
24 -import org.apache.http.Header;
25 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
26 import org.springframework.beans.factory.annotation.Value; 22 import org.springframework.beans.factory.annotation.Value;
27 import org.springframework.util.StopWatch; 23 import org.springframework.util.StopWatch;
28 -import org.springframework.validation.annotation.Validated;
29 import org.springframework.web.bind.annotation.*; 24 import org.springframework.web.bind.annotation.*;
30 25
31 import javax.servlet.http.HttpServletRequest; 26 import javax.servlet.http.HttpServletRequest;
......
1 package com.erry.iclear.dateInterface.api; 1 package com.erry.iclear.dateInterface.api;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.request.HsCodeParam; 4 import com.erry.iclear.dateInterface.api.request.HsCodeParam;
5 import com.erry.iclear.dateInterface.api.response.ResultHsCode; 5 import com.erry.iclear.dateInterface.api.response.ResultHsCode;
6 import com.erry.iclear.dateInterface.entity.IClearApiHsCodeLog; 6 import com.erry.iclear.dateInterface.entity.IClearApiHsCodeLog;
......
1 package com.erry.iclear.dateInterface.interceptor; 1 package com.erry.iclear.dateInterface.interceptor;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 4 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
5 import com.erry.iclear.dateInterface.api.response.ResultHsCode; 5 import com.erry.iclear.dateInterface.api.response.ResultHsCode;
6 -import com.erry.iclear.dateInterface.api.response.ResultRS;
7 import com.erry.iclear.dateInterface.common.Constant; 6 import com.erry.iclear.dateInterface.common.Constant;
8 import com.erry.iclear.dateInterface.util.SHA256Util; 7 import com.erry.iclear.dateInterface.util.SHA256Util;
9 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
...@@ -16,7 +15,6 @@ import javax.servlet.http.HttpServletRequest; ...@@ -16,7 +15,6 @@ import javax.servlet.http.HttpServletRequest;
16 import javax.servlet.http.HttpServletResponse; 15 import javax.servlet.http.HttpServletResponse;
17 import java.io.IOException; 16 import java.io.IOException;
18 import java.io.PrintWriter; 17 import java.io.PrintWriter;
19 -import java.util.Enumeration;
20 import java.util.HashMap; 18 import java.util.HashMap;
21 19
22 /** 20 /**
......
1 package com.erry.iclear.dateInterface.interceptor; 1 package com.erry.iclear.dateInterface.interceptor;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 4 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
5 import com.erry.iclear.dateInterface.api.response.ResultRS; 5 import com.erry.iclear.dateInterface.api.response.ResultRS;
6 import com.erry.iclear.dateInterface.common.Constant; 6 import com.erry.iclear.dateInterface.common.Constant;
7 import com.erry.iclear.dateInterface.util.SHA256Util; 7 import com.erry.iclear.dateInterface.util.SHA256Util;
......
1 package com.erry.iclear.dateInterface.service; 1 package com.erry.iclear.dateInterface.service;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.request.Mawb; 4 import com.erry.iclear.dateInterface.api.request.Mawb;
5 import com.erry.iclear.dateInterface.api.request.MawbDetail; 5 import com.erry.iclear.dateInterface.api.request.MawbDetail;
6 import com.erry.iclear.dateInterface.api.request.ReceiptMessage; 6 import com.erry.iclear.dateInterface.api.request.ReceiptMessage;
......
1 package com.erry.iclear.dateInterface.service; 1 package com.erry.iclear.dateInterface.service;
2 2
3 //import cn.hutool.core.date.DateUtil; 3 //import cn.hutool.core.date.DateUtil;
4 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 4 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
5 import com.erry.iclear.dateInterface.api.request.FedexMawb; 5 import com.erry.iclear.dateInterface.api.request.FedexMawb;
6 import com.erry.iclear.dateInterface.api.request.FedexReceipt; 6 import com.erry.iclear.dateInterface.api.request.FedexReceipt;
7 import com.erry.iclear.dateInterface.api.request.Mawb; 7 import com.erry.iclear.dateInterface.api.request.Mawb;
......
1 package com.erry.iclear.dateInterface.service; 1 package com.erry.iclear.dateInterface.service;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.request.*; 4 import com.erry.iclear.dateInterface.api.request.*;
5 import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult; 5 import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult;
6 import com.erry.iclear.dateInterface.api.response.ResultRS; 6 import com.erry.iclear.dateInterface.api.response.ResultRS;
...@@ -169,7 +169,7 @@ public class FedexService { ...@@ -169,7 +169,7 @@ public class FedexService {
169 */ 169 */
170 public ResultRS checkBasfInterfaceData(Fedexc fedexc, AppInfo appInfo){ 170 public ResultRS checkBasfInterfaceData(Fedexc fedexc, AppInfo appInfo){
171 171
172 - ResultRS result = new ResultRS(Boolean.FALSE,"",""); 172 + ResultRS result = new ResultRS(Boolean.FALSE,null,null);
173 173
174 if(Objects.equals(fedexc,null)){ 174 if(Objects.equals(fedexc,null)){
175 result.setCode(ErrorCodeEnum.ERROR_7.getCode()); 175 result.setCode(ErrorCodeEnum.ERROR_7.getCode());
......
1 package com.erry.iclear.dateInterface.service; 1 package com.erry.iclear.dateInterface.service;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.request.HsCodeParam; 4 import com.erry.iclear.dateInterface.api.request.HsCodeParam;
5 import com.erry.iclear.dateInterface.api.response.ResultHsCode; 5 import com.erry.iclear.dateInterface.api.response.ResultHsCode;
6 import com.erry.iclear.dateInterface.common.Constant; 6 import com.erry.iclear.dateInterface.common.Constant;
...@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
12 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
14 14
15 -import java.sql.*;
16 import java.util.*; 15 import java.util.*;
17 16
18 /** 17 /**
......
1 package com.erry.iclear.dateInterface.service; 1 package com.erry.iclear.dateInterface.service;
2 2
3 -import com.arronlong.httpclientutil.HttpClientUtil; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 -import com.arronlong.httpclientutil.common.HttpConfig;
5 -import com.arronlong.httpclientutil.common.HttpHeader;
6 -import com.erry.iclear.dateInterface.ErrorCodeEnum;
7 import com.erry.iclear.dateInterface.api.request.Mawb; 4 import com.erry.iclear.dateInterface.api.request.Mawb;
8 import com.erry.iclear.dateInterface.api.request.MawbDetail; 5 import com.erry.iclear.dateInterface.api.request.MawbDetail;
9 import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult; 6 import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult;
...@@ -16,7 +13,6 @@ import com.erry.iclear.dateInterface.util.JsonToJava; ...@@ -16,7 +13,6 @@ import com.erry.iclear.dateInterface.util.JsonToJava;
16 import com.erry.iclear.dateInterface.util.StringUtil; 13 import com.erry.iclear.dateInterface.util.StringUtil;
17 import com.google.gson.Gson; 14 import com.google.gson.Gson;
18 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
19 -import org.apache.http.Header;
20 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.beans.factory.annotation.Value; 17 import org.springframework.beans.factory.annotation.Value;
22 import org.springframework.stereotype.Service; 18 import org.springframework.stereotype.Service;
......
1 package com.erry.iclear.dateInterface.task; 1 package com.erry.iclear.dateInterface.task;
2 2
3 -import com.erry.iclear.dateInterface.ErrorCodeEnum; 3 +import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
4 import com.erry.iclear.dateInterface.api.response.TokenResult; 4 import com.erry.iclear.dateInterface.api.response.TokenResult;
5 import com.erry.iclear.dateInterface.service.ApiService; 5 import com.erry.iclear.dateInterface.service.ApiService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
......