|
@@ -205,7 +205,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
public KD100Result getLogistics(Long id) {
|
|
public KD100Result getLogistics(Long id) {
|
|
LogisticsInfos logisticsInfo = this.getById(id);
|
|
LogisticsInfos logisticsInfo = this.getById(id);
|
|
Assert.notEmpty(logisticsInfo, "没有找到物流信息");
|
|
Assert.notEmpty(logisticsInfo, "没有找到物流信息");
|
|
- return KD100Util.queryTrack(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode());
|
|
|
|
|
|
+ return KD100Util.queryTrack(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode(),logisticsInfo.getPhone());
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -213,7 +213,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
public void dataInfoEdit(Long id) {
|
|
public void dataInfoEdit(Long id) {
|
|
LogisticsInfos logisticsInfo = getById(id);
|
|
LogisticsInfos logisticsInfo = getById(id);
|
|
Assert.notEmpty(logisticsInfo, "没有找到物流信息");
|
|
Assert.notEmpty(logisticsInfo, "没有找到物流信息");
|
|
- KD100Result kd100Result = KD100Util.queryTrack(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode());
|
|
|
|
|
|
+ KD100Result kd100Result = KD100Util.queryTrack(logisticsInfo.getLogisticsCompanyCode(), logisticsInfo.getCode(),logisticsInfo.getPhone());
|
|
Integer state = kd100Result.getState();
|
|
Integer state = kd100Result.getState();
|
|
if (ObjectUtil.notEqual(state, logisticsInfo.getLogisticsStatus())) {
|
|
if (ObjectUtil.notEqual(state, logisticsInfo.getLogisticsStatus())) {
|
|
//原来是异常物流信息 限制刷新到状态就添加订阅
|
|
//原来是异常物流信息 限制刷新到状态就添加订阅
|
|
@@ -283,7 +283,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
String com = logisticsInfos.getLogisticsCompanyCode();
|
|
String com = logisticsInfos.getLogisticsCompanyCode();
|
|
String num = logisticsInfos.getCode();
|
|
String num = logisticsInfos.getCode();
|
|
try {
|
|
try {
|
|
- KD100Result kd100Result = KD100Util.queryTrack(com, num, configInfo);
|
|
|
|
|
|
+ KD100Result kd100Result = KD100Util.queryTrack(com, num, logisticsInfos.getPhone(), configInfo);
|
|
if (kd100Result.getState() == null || kd100Result.getState() == -1) {
|
|
if (kd100Result.getState() == null || kd100Result.getState() == -1) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|