Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -3,17 +3,15 @@ package com.klp.utils;
|
|||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
import com.alibaba.fastjson2.JSONArray;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.klp.domain.vo.WmsCustomerVo;
|
|
||||||
import com.klp.domain.vo.WmsExpressVo;
|
import com.klp.domain.vo.WmsExpressVo;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.*;
|
import com.sf.fop.sxjd.oms.open.platform.*;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_EWB_ORDER_SAVE.EwbOrderSaveRequest;
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_EWB_ORDER_SAVE.EwbOrderSaveRequest;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_EWB_ORDER_SAVE.EwbOrderSaveResponse;
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_EWB_ORDER_SAVE.EwbOrderSaveResponse;
|
||||||
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SendResponse;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_ORDER_STATUS_NOTIFY.OrderStatusNotifyRequest;
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_ORDER_STATUS_NOTIFY.OrderStatusNotifyRequest;
|
||||||
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SdkReceiveRequest;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_QUERY_TRACK.QueryTrackRequest;
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_QUERY_TRACK.QueryTrackRequest;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_QUERY_TRACK.QueryTrackResponse;
|
import com.sf.fop.sxjd.oms.open.platform.api.bean.SX_QUERY_TRACK.QueryTrackResponse;
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SdkReceiveRequest;
|
|
||||||
import com.sf.fop.sxjd.oms.open.platform.api.bean.SendResponse;
|
|
||||||
import org.apache.commons.codec.binary.Base64;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -22,9 +20,13 @@ import java.io.OutputStream;
|
|||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.security.MessageDigest;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
import org.apache.commons.codec.binary.Base64;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 顺心捷达路由查询工具类
|
* 顺心捷达路由查询工具类
|
||||||
@@ -95,7 +97,8 @@ public class SxjdRouteQueryUtil {
|
|||||||
* @return 查询结果JSON字符串
|
* @return 查询结果JSON字符串
|
||||||
*/
|
*/
|
||||||
public static String queryRoute(String expressCode) {
|
public static String queryRoute(String expressCode) {
|
||||||
return queryTrackByHttp(expressCode);
|
SendResponse<QueryTrackResponse> response = queryTrack(expressCode);
|
||||||
|
return JSON.toJSONString(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -272,7 +275,7 @@ public class SxjdRouteQueryUtil {
|
|||||||
|
|
||||||
// 测试轨迹查询
|
// 测试轨迹查询
|
||||||
String waybillId = "S60201493742";
|
String waybillId = "S60201493742";
|
||||||
String trackResult = queryTrackByHttp(waybillId);
|
SendResponse<QueryTrackResponse> trackResult = queryTrack(waybillId);
|
||||||
System.out.println("轨迹查询测试结果: " + trackResult);
|
System.out.println("轨迹查询测试结果: " + trackResult);
|
||||||
|
|
||||||
// 测试MD5加密
|
// 测试MD5加密
|
||||||
|
|||||||
Reference in New Issue
Block a user