Merge branch 'feature/20210125-益禾堂添加排队号-张志恒'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -232,6 +232,11 @@ public class QueryOrdersResponse {
              * 排队进度百分比
              */
             private String progress = "" ; //进度
+
+            /**
+             * 是否展示进度条
+             */
+            private Integer orderProgressBarStatus ;
             /**
              * 订单类型   1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
              */

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

@@ -931,6 +931,9 @@ public class OrderServiceImpl implements Orderservice {
                     Long pickUpTime = 0L; //预计
                     Integer totalSumTime = 0;
                     String progress = "0" ; //进度
+                    JSONObject storeJsonObject = JSONObject.parseObject(storeResponseDto.getConfiguration());
+                    StoreResponse.Configuration configuration = storeJsonObject.toJavaObject(StoreResponse.Configuration.class);
+                    Integer orderProgressBarStatus = configuration.getOrderProgressBarStatus();; //默认关闭
                     //订单状态为已接单并且无售后单展示进度条
                     if(OrderStatus.RECEIPT.getCode() == orderBean.getStatus() && null == orderBean.getAfterSalesOrderResp()) {
                         try {
@@ -941,7 +944,7 @@ public class OrderServiceImpl implements Orderservice {
                             queryLineUpOrderReq.setStartTime(DateUtil.addHours(new Date(orderBean.getGmtCreate()), -24).getTime());
                             queryLineUpOrderReq.setEndTime(orderBean.getGmtCreate());
                             // 取餐排队人数查询代码去除
-                            QueryLineUpResponse response = orderCenterSdkService.queryLineUpOrder(queryLineUpOrderReq);
+                            QueryLineUpResponse response = orderCenterSdkService.queryLineUpOrder(queryLineUpOrderReq);;
                             if (RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
                                 if (null == response.getOrderCodes()) {
                                     progress = "100";
@@ -949,8 +952,6 @@ public class OrderServiceImpl implements Orderservice {
                                 } else {
                                     List<String> orderCodeList = response.getOrderCodes();
                                     if (null != orderCodeList && orderCodeList.size() > 0) {
-                                        JSONObject jsonObject = JSONObject.parseObject(storeResponseDto.getConfiguration());
-                                        StoreResponse.Configuration configuration = jsonObject.toJavaObject(StoreResponse.Configuration.class);
                                         Integer goodsAvgTimeOfMaking = 0 == configuration.getGoodsAvgTimeOfMaking() ? 15 : configuration.getGoodsAvgTimeOfMaking();
                                         returnWords += "前方还有 " + orderCodeList.size() + " 单";
                                         //开启制作时间 1 ：是 ， 2 ：否"
@@ -976,7 +977,7 @@ public class OrderServiceImpl implements Orderservice {
                     }
                     orderBean.setProgress(String.valueOf(progress));
                     orderBean.setReturnWords(returnWords);
-
+                    orderBean.setOrderProgressBarStatus(orderProgressBarStatus);
                     //以下代码为老代码，不确定还在不在用，就留着了
                     // 查询订单的排队人数
                     BaseQueryOrderRequest var1 = new BaseQueryOrderRequest();