diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index a00e8369e..8700fb555 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -403,24 +403,9 @@ public class EmisBaseService { EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode); if(emisTmsTransferTrace!=null){ if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){ - JSONObject jsonObject = JSONObject.parseObject(emisTmsTransferTrace.getTraceInfo()); - JSONArray steps=jsonObject.getJSONArray("data"); - if(steps!=null && steps.size()>0){ - recordList = new ArrayList<>(); - for (Object obj:steps) { - JSONObject stepItem = (JSONObject)obj; - EmisTmsScanRecord recordItem = new EmisTmsScanRecord(); - recordItem.setBillCode(billCode); - recordItem.setScanDate(DateUtils.parseDate(stepItem.getString("time"))); - recordItem.setRemark(stepItem.getString("context")); - recordItem.setScanType("81"); - recordList.add(recordItem); - } - } + recordList = Kd100Helper.cvtTraceToScanRecord(billCode,emisTmsTransferTrace.getTraceInfo()); } } - - } catch (Exception e) { e.printStackTrace(); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java index b7ab40c89..ddeb8061a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java @@ -10,12 +10,10 @@ import com.xdadan.erp.emis.domain.EmisTmsTransferTrace; import com.xdadan.erp.emis.domain.EmisWaybill; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 快递100 Api @@ -61,6 +59,32 @@ public class Kd100Helper { return allResult; } + public static List cvtTraceToScanRecord(String billCode,String traceInfo) { + List recordList= null; + try { + if(!StringUtils.isEmpty(traceInfo)){ + JSONObject jsonObject = JSONObject.parseObject(traceInfo); + JSONArray steps=jsonObject.getJSONArray("data"); + if(steps!=null && steps.size()>0){ + recordList = new ArrayList<>(); + for (Object obj:steps) { + JSONObject stepItem = (JSONObject)obj; + EmisTmsScanRecord recordItem = new EmisTmsScanRecord(); + recordItem.setBillCode(billCode); + recordItem.setScanDate(DateUtils.parseDate(stepItem.getString("time"))); + recordItem.setRemark(stepItem.getString("context")); + recordItem.setScanType("81"); + recordList.add(recordItem); + } + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + + return recordList; + } public static EmisTmsTransferTrace queryTmsTransferTraceByKd100(EmisTmsTransferTrace emisTmsTransferTrace) { @@ -113,11 +137,15 @@ public class Kd100Helper { public static void main(String[] args) { String rst= null; try { - EmisTmsTransferTrace emisTmsTransferTrace = new EmisTmsTransferTrace(); - emisTmsTransferTrace.setTransferBillCode("SF1532297522428"); - emisTmsTransferTrace.setTransferExpress("shunfeng"); - emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace); - System.out.println(JSON.toJSONString(emisTmsTransferTrace)); +// EmisTmsTransferTrace emisTmsTransferTrace = new EmisTmsTransferTrace(); +// emisTmsTransferTrace.setTransferBillCode("SF1532297522428"); +// emisTmsTransferTrace.setTransferExpress("shunfeng"); +// emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace); + + String str=queryTraceByMainNoAndCom("SF1532297522428","shunfeng"); + + List list=cvtTraceToScanRecord("12321",str); + System.out.println(JSON.toJSONString(list)); } catch (Exception e) { e.printStackTrace(); }