Commit 4b41a4c9 by zhiheng.zhang

门店返回对象不能为空

parent 84c043b1
...@@ -932,6 +932,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -932,6 +932,7 @@ public class OrderServiceImpl implements Orderservice {
Integer totalSumTime = 0; Integer totalSumTime = 0;
String progress = "0" ; //进度 String progress = "0" ; //进度
Integer orderProgressBarStatus = 2; Integer orderProgressBarStatus = 2;
if(null != storeResponseDto){
StoreResponse.Configuration configuration = storeResponseDto.getStoreConfig(); StoreResponse.Configuration configuration = storeResponseDto.getStoreConfig();
if(null != configuration) { if(null != configuration) {
log.info("StoreResponse.Configuration {}", JSONObject.toJSONString(configuration)); log.info("StoreResponse.Configuration {}", JSONObject.toJSONString(configuration));
...@@ -980,6 +981,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -980,6 +981,7 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
} }
}
orderBean.setProgress(String.valueOf(progress)); orderBean.setProgress(String.valueOf(progress));
orderBean.setReturnWords(returnWords); orderBean.setReturnWords(returnWords);
orderBean.setOrderProgressBarStatus(orderProgressBarStatus); orderBean.setOrderProgressBarStatus(orderProgressBarStatus);
......
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