Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

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

@@ -1007,7 +1007,24 @@ public class OrderServiceImpl implements Orderservice {
         OrderViewStatusDto orderViewStatusDesc = orderAdapter.getOrderViewStatusDesc(orderBean, userLoginInfoDto.getWxAppId());
         Map<String, Object> responseMap = Maps.newTreeMap();
         responseMap.put("orderStatus", orderViewStatusDesc.getOrderStatus());
-        responseMap.put("takeCode",orderBean.getOtherCode() );
+        responseMap.put("takeCode","");
+        responseMap.put("queueIndex","");
+        //非外卖单才获取取餐码和排队人数
+        if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getType()) ){
+            responseMap.put("takeCode",orderBean.getOtherCode() );
+
+            BaseQueryOrderRequest var1 = new BaseQueryOrderRequest();
+            var1.setOrderId(orderBean.getOid());
+            var1.setTrackingNo(LogTreadLocal.getTrackingNo());
+            BaseOrderResponse baseOrderResponse = orderCenterSdkService.queryOrderQueueIndex(var1);
+            QueryOrderQueueIndexResponse response1 = new QueryOrderQueueIndexResponse();
+            response1.setErrcode(baseOrderResponse.getErrcode());
+            response1.setErrmsg(baseOrderResponse.getErrmsg());
+            if (RESPONSE_SUCCESS_CODE.equals(response1.getErrcode())) {
+                String queueIndex = response1.getData() == null ? "" : response1.getData().toString();
+                responseMap.put("queueIndex",queueIndex);
+            }
+        }
         return ResponseUtil.success(responseMap);
     }