aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-13 20:42:22 +08:00
parent 20dc9e1f1a
commit 53e4124b82
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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();
}

46
emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
View File

@ -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<EmisTmsScanRecord> cvtTraceToScanRecord(String billCode,String traceInfo) {
List<EmisTmsScanRecord> 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<EmisTmsScanRecord> list=cvtTraceToScanRecord("12321",str);
System.out.println(JSON.toJSONString(list));
} catch (Exception e) {
e.printStackTrace();
}