Merge branch 'feature/20210218-点餐进度优化-张志恒'

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

@@ -936,7 +936,7 @@ public class OrderServiceImpl implements Orderservice {
                     log.info("StoreResponse.Configuration {}",JSONObject.toJSONString(configuration));
                     Integer orderProgressBarStatus = configuration.getOrderProgressBarStatus();; //默认关闭
                     //订单状态为已接单并且无售后单展示进度条
-                    if(OrderStatus.RECEIPT.getCode() == orderBean.getStatus() && null == orderBean.getAfterSalesOrderResp()) {
+                    if(OrderStatus.RECEIPT.getCode() == orderBean.getStatus() && null == orderBean.getAfterSalesOrderResp() && null != orderProgressBarStatus && null != configuration.getTurnOnTimeOfMaking()) {
                         try {
                             // 查询订单的排队人数
                             QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
@@ -953,12 +953,12 @@ public class OrderServiceImpl implements Orderservice {
                                 } else {
                                     List<String> orderCodeList = response.getOrderCodes();
                                     if (null != orderCodeList && orderCodeList.size() > 0) {
-                                        Integer goodsAvgTimeOfMaking = 0 == configuration.getGoodsAvgTimeOfMaking() ? 15 : configuration.getGoodsAvgTimeOfMaking();
                                         returnWords += "前方还有 " + orderCodeList.size() + " 单";
                                         //开启制作时间 1 ：是 ， 2 ：否"
                                         if (1 != configuration.getTurnOnTimeOfMaking()) {
                                             totalSumTime = orderCodeList.size() * AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime()); //分钟
                                         } else {
+                                            Integer goodsAvgTimeOfMaking = (null == configuration.getGoodsAvgTimeOfMaking() || 0 == configuration.getGoodsAvgTimeOfMaking())? 5 : configuration.getGoodsAvgTimeOfMaking();
                                             productSum = orderCodeList.stream().mapToInt(product -> Integer.parseInt(product.split("-")[1])).sum();
                                             totalSumTime = productSum * goodsAvgTimeOfMaking;
                                             returnWords += " / " + productSum + " 件";
@@ -973,7 +973,7 @@ public class OrderServiceImpl implements Orderservice {
                                 }
                             }
                         } catch (Exception e) {
-                            log.error("get returnWords error {}", e.getMessage());
+                            log.error("get returnWords error :{}，StoreResponse.Configuration:{}", e.getMessage(),JSONObject.toJSONString(configuration));
                         }
                     }
                     orderBean.setProgress(String.valueOf(progress));