益禾堂添加排队号

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

@@ -355,6 +355,6 @@ public interface OrderCenterSdkService {
     /**
      * 获取历史订单
      */
-    BaseOrderResponse queryHistoryOrder(QueryLineUpOrderReq queryLineUpOrderReq);
+    BaseOrderResponse queryLineUpOrder(QueryLineUpOrderReq queryLineUpOrderReq);
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1960,8 +1960,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
-    public BaseOrderResponse queryHistoryOrder(QueryLineUpOrderReq queryLineUpOrderReq) {
-        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<String>> response = orderSdkService.queryHistoryOrder(queryLineUpOrderReq, LogThreadLocal.getTrackingNo());
+    public BaseOrderResponse queryLineUpOrder(QueryLineUpOrderReq queryLineUpOrderReq) {
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<String>> response = orderSdkService.queryLineUpOrder(queryLineUpOrderReq, LogThreadLocal.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
 }

order-application-service/src/main/java/cn/freemud/entities/dto/OrderExtInfoDto.java

-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @Title: OrderExtInfoDto
- * @Package cn.freemud.entities.dto
- * @Description:
- * @author: liming.guo
- * @date: 2018/6/13 18:38
- * @version V1.0
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- *//*
-
-package cn.freemud.entities.dto;
-
-import lombok.Data;
-
-@Data
-public class OrderExtInfoDto {
-
-    private  String prepayId;
-
-    private String accessToken;
-    */
-/**
-     * 到期时间
-     *//*
-
-    private String expireDate;
-    */
-/**
-     * 外卖开始时间
-     *//*
-
-    private String deliveryHoursDayStart;
-    */
-/**
-     * 外卖结束时间
-     *//*
-
-    private String deliveryHoursDayEnd;
-
-
-    private String openid;
-
-    private String appid;
-
-    private String appsecret;
-    */
-/**
-     * 订单支付时间
-     *//*
-
-    private String payDate;
-    */
-/**
-     * 第三方流水号
-     *//*
-
-    private String payTransId;
-    */
-/**
-     * sessionId
-     *//*
-
-    private String sessionId;
-    */
-/**
-     * 预计送达时间
-     *//*
-
-    private Integer serviceTime;
-    */
-/**
-     * 第三方外卖定时推单时间
-     *//*
-
-    private Integer pushOrderTime;
-    */
-/**
-     *  版本号
-     *//*
-
-    private String version;
-    */
-/**
-     * 会员规则ID
-     *//*
-
-    private String ruleId;
-    */
-/**
-     * 预支付 transId
-     *//*
-
-    private String prePayTransId;
-
-    */
-/**
-     * 预支付返回的fmId
-     *//*
-
-    private String fmId;
-
-    */
-/**
-     * 创建预支付订单userId
-     *//*
-
-    private String prePayUserId;
-    
-    */
-/**
-     * 用户手机号
-     *//*
-
-    private String phone;
-    */
-/**
-     * 平台支付订单号(微信订单号)
-     *//*
-
-    private String paid_no;
-    */
-/**
-     * 渠道方流水号 （比如扫呗，易宝等） 新支付服务做中转使用
-     *//*
-
-    private String endTransId;
-    */
-/**
-     * 第三方支付商户号 新支付服务做中转使用
-     *//*
-
-    private String platformMchId;
-    */
-/**
-     * 扫呗商户号 新支付服务做中转使用
-     *//*
-
-    private String terminalId;
-
-    */
-/**
-     * 微信上报使用的异常补退使用
-     *//*
-
-    private String sessionKey;
-}
-*/

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

@@ -930,10 +930,10 @@ public class OrderServiceImpl implements Orderservice {
                         QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
                         queryLineUpOrderReq.setPartnerId(orderBean.getCompanyId());
                         queryLineUpOrderReq.setStoreId(orderBean.getShopId());
-                        queryLineUpOrderReq.setStartTime(orderBean.getGmtCreate());
+                        queryLineUpOrderReq.setStartTime(DateUtil.addHours(new Date(orderBean.getGmtCreate()),-24).getTime());
                         queryLineUpOrderReq.setEndTime(orderBean.getGmtCreate());
                         // 取餐排队人数查询代码去除
-                        BaseOrderResponse response = orderCenterSdkService.queryHistoryOrder(queryLineUpOrderReq);
+                        BaseOrderResponse response = orderCenterSdkService.queryLineUpOrder(queryLineUpOrderReq);
                         List<String> strings = new ArrayList<>();
                         if (RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
                             if (StringUtils.isEmpty(response.getData())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -238,6 +238,6 @@ public class InterfaceAddressConstant {
     /**
      * 查询当前门店24小时内的订单
      */
-    public static final String QUERY_HISTORY_ORDER = "order/v2/queryHistoryOrder";
+    public static final String QUERY_LINEUP_ORDER = "order/v2/queryLineUpOrder";
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -903,8 +903,8 @@ public class OrderSdkService {
     /**
      * 查询历史订单
      */
-    public BaseResponse<List<String>> queryHistoryOrder(QueryLineUpOrderReq queryLineUpOrderReq, String trackingNo) {
-        OrderBaseResp<List<String>> responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, QUERY_HISTORY_ORDER,
+    public BaseResponse<List<String>> queryLineUpOrder(QueryLineUpOrderReq queryLineUpOrderReq, String trackingNo) {
+        OrderBaseResp<List<String>> responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, QUERY_LINEUP_ORDER,
                 createBaseRequest(queryLineUpOrderReq, trackingNo), new ParameterizedTypeReference<OrderBaseResp<List<String>>>() {
                 });
         return responseHandle(responseDTO);