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

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

@@ -1015,8 +1015,10 @@ public class OrderServiceImpl implements Orderservice {
         responseMap.put("queueIndex","");
         //非外卖单才获取取餐码和排队人数
         if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getType()) ){
-            responseMap.put("takeCode",orderBean.getOtherCode() );
-
+            if (!(OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())
+                    || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()))){
+                responseMap.put("takeCode",orderBean.getOtherCode() );
+            }
             BaseQueryOrderRequest var1 = new BaseQueryOrderRequest();
             var1.setOrderId(orderBean.getOid());
             var1.setTrackingNo(LogTreadLocal.getTrackingNo());
@@ -1304,6 +1306,11 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setReserveDeliveryTime(formatSpecialDate(reserveDeliveryTime));
         }
 
+        if (OrderStatus.TAKE_ORDER.getCode().equals(queryOrderResponseVo.getOrderStatus())
+                || OrderStatus.WAIT_PAY.getCode().equals(queryOrderResponseVo.getOrderStatus())){
+            queryOrderResponseVo.setTakeCode("");
+        }
+
         //48小时自动退款描述
         if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig()!= null
                 && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {