Merge branch 'feature/20210309-支付有礼添加券log-张志恒'

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

@@ -932,14 +932,15 @@ public class OrderServiceImpl implements Orderservice {
                     Integer totalSumTime = 0;
                     String progress = "0" ; //进度
                     Integer orderProgressBarStatus = 2;
-                    StoreResponse.Configuration configuration = storeResponseDto.getStoreConfig();
-                    if(null != configuration) {
-                        log.info("StoreResponse.Configuration {}", JSONObject.toJSONString(configuration));
+                    String configurationStr = storeResponseDto.getConfiguration();
+                    if(StringUtils.isNotEmpty(configurationStr)) {
+                        try{
+                            StoreResponse.Configuration configuration = JSONObject.parseObject(configurationStr).toJavaObject(StoreResponse.Configuration.class);
+                            if (null != configuration) {
                                 orderProgressBarStatus = configuration.getOrderProgressBarStatus();
                                 ; //默认关闭
                                 //订单状态为已接单并且无售后单展示进度条
                                 if (OrderStatus.RECEIPT.getCode() == orderBean.getStatus() && null == orderBean.getAfterSalesOrderResp() && null != orderProgressBarStatus && null != configuration.getTurnOnTimeOfMaking()) {
-                            try {
                                     // 查询订单的排队人数
                                     QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
                                     queryLineUpOrderReq.setPartnerId(orderBean.getCompanyId());
@@ -948,7 +949,6 @@ public class OrderServiceImpl implements Orderservice {
                                     queryLineUpOrderReq.setEndTime(orderBean.getGmtCreate());
                                     // 取餐排队人数查询代码去除
                                     QueryLineUpResponse response = orderCenterSdkService.queryLineUpOrder(queryLineUpOrderReq);
-                                ;
                                     if (RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
                                         if (null == response.getOrderCodes()) {
                                             progress = "100";
@@ -975,10 +975,11 @@ public class OrderServiceImpl implements Orderservice {
                                             }
                                         }
                                     }
-                            } catch (Exception e) {
-                                log.error("get returnWords error :{}，StoreResponse.Configuration:{}", e.getMessage(), JSONObject.toJSONString(configuration));
                                 }
                             }
+                        }catch (Exception e){
+                            log.error("get returnWords error :{}，StoreResponse.Configuration:{}", e.getMessage(), configurationStr);
+                        }
                     }
                     orderBean.setProgress(String.valueOf(progress));
                     orderBean.setReturnWords(returnWords);