门店返回对象不能为空

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -932,10 +932,10 @@ public class OrderServiceImpl implements Orderservice {
                     Integer totalSumTime = 0;
                     String progress = "0" ; //进度
                     Integer orderProgressBarStatus = 2;
-                    if(null != storeResponseDto){
-                        String configurationStr = storeResponseDto.getConfiguration();
-                        if(StringUtils.isNotEmpty(configurationStr)) {
-                            try{
+                    try{
+                        if(null != storeResponseDto){
+                            String configurationStr = storeResponseDto.getConfiguration();
+                            if(StringUtils.isNotEmpty(configurationStr)) {
                                 StoreResponse.Configuration configuration = JSONObject.parseObject(configurationStr).toJavaObject(StoreResponse.Configuration.class);
                                 if (null != configuration) {
                                     orderProgressBarStatus = configuration.getOrderProgressBarStatus();
@@ -978,10 +978,10 @@ public class OrderServiceImpl implements Orderservice {
                                         }
                                     }
                                 }
-                            }catch (Exception e){
-                                log.error("get returnWords error :{}，StoreResponse.Configuration:{}", e.getMessage(), configurationStr);
                             }
                         }
+                    }catch (Exception e){
+                        log.error("get returnWords error :{}，storeResponseDto:{}", e.getMessage(), JSONObject.toJSON(storeResponseDto));
                     }
                     orderBean.setProgress(String.valueOf(progress));
                     orderBean.setReturnWords(returnWords);