记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit c1d54964 authored by anjiabin's avatar anjiabin
Browse files
Options

Merge branch 'test' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into test

parents 9234b4bb 39252f44
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/PerformancesExpressInfoServiceImpl.java
View file @ c1d54964
...@@ -35,11 +35,9 @@ public class PerformancesExpressInfoServiceImpl { ...@@ -35,11 +35,9 @@ public class PerformancesExpressInfoServiceImpl {
public KylinOrderExpressVo orderRouteDetail(String orderTicketsId) { public KylinOrderExpressVo orderRouteDetail(String orderTicketsId) {
LinkedList<KylinOrderExpressRouteVo> routeList = dataUtils.getOrderExpressRoute(orderTicketsId); LinkedList<KylinOrderExpressRouteVo> routeList = dataUtils.getOrderExpressRoute(orderTicketsId);
KylinOrderExpressVo expressInfo = dataUtils.getOrderExpressInfos(orderTicketsId); KylinOrderExpressVo expressInfo = dataUtils.getOrderExpressInfos(orderTicketsId);
if (null == routeList) { if (null != expressInfo) {
routeList = new LinkedList<>();
}
log.info("1111");
expressInfo.setRouteList(routeList); expressInfo.setRouteList(routeList);
}
return expressInfo; return expressInfo;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment