修改参数

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

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Description:
+ * @author: jiming.liu
+ * @date: 2021/8/3 上午10:54
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class QueryLineUpOrderDto {
+    /**
+     * 商户号
+     */
+    private String partnerId;
+
+    /**
+     * 门店编号
+     */
+    private String storeId;
+
+    /**
+     * 时间开始
+     */
+    private Long startTime;
+
+    /**
+     * 时间开始
+     */
+    private Long endTime;
+    /**
+     * 订单号
+     */
+    private String orderCode;
+    /**
+     *　三方订单号
+     */
+    private String thirdOrderCode;
+    /**
+     * 三方门店号
+     */
+    private String thirdStoreId;
+}

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

@@ -31,35 +31,21 @@ import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.SendMessageRequest;
-import cn.freemud.entities.dto.ecology.SendMessageResponse;
-import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
-import cn.freemud.entities.dto.ecology.SendMessageRequest;
-import cn.freemud.entities.dto.order.CreateOrderOperateDto;
-import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
-import cn.freemud.entities.dto.order.FacePayRequestDto;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.*;
 import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.pay.MultiPaymentRespDto;
 import cn.freemud.entities.dto.pay.MultiQueryRequest;
 import cn.freemud.entities.dto.pay.MultiQueryRespDto;
-import cn.freemud.entities.dto.promotion.*;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.GroupDetail;
 import cn.freemud.entities.dto.product.ProductAttributeGroup;
 import cn.freemud.entities.dto.product.ProductGroup;
+import cn.freemud.entities.dto.promotion.QueryHistoryGroupVO;
 import cn.freemud.entities.dto.shoppingCart.CollageOrderDto;
 import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
-import cn.freemud.enums.AfterSalesOrderCreateEventEnum;
-import cn.freemud.enums.OrderChannelType;
-import cn.freemud.enums.PayRefundStatus;
-import cn.freemud.enums.PayStatus;
-import cn.freemud.enums.QueryOrderStatus;
-import cn.freemud.enums.RefundStatus;
-import cn.freemud.enums.ResponseResult;
-import cn.freemud.enums.OrderType;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
 import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
@@ -94,10 +80,6 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
-//import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
-//import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
-//import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
-//import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -105,11 +87,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
-import com.freemud.application.sdk.api.ordercenter.enums.*;
-import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
-import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
-import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
-import com.freemud.application.sdk.api.ordercenter.request.SdkUpdateAbnormalState;
+import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.*;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
@@ -1113,15 +1091,17 @@ public class OrderServiceImpl implements Orderservice {
         Long pickUpTime = 0L; //预计
         Integer totalSumTime = 0;
         String progress = "0"; //进度
-        QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
-        queryLineUpOrderReq.setPartnerId(orderBean.getCompanyId());
-        queryLineUpOrderReq.setStoreId(orderBean.getShopId());
-        queryLineUpOrderReq.setStartTime(DateUtil.addHours(new Date(orderBean.getGmtCreate()), -24).getTime());
-        queryLineUpOrderReq.setEndTime(orderBean.getGmtCreate());
-        queryLineUpOrderReq.setOrderCode(orderBean.getOid());
-        queryLineUpOrderReq.setThirdOrderCode(orderBean.getThirdOrderCode());
+        QueryLineUpOrderDto queryLineUpOrderDto = new QueryLineUpOrderDto();
+        queryLineUpOrderDto.setPartnerId(orderBean.getCompanyId());
+        queryLineUpOrderDto.setStoreId(orderBean.getShopId());
+        queryLineUpOrderDto.setStartTime(DateUtil.addHours(new Date(orderBean.getGmtCreate()), -24).getTime());
+        queryLineUpOrderDto.setEndTime(orderBean.getGmtCreate());
+        queryLineUpOrderDto.setOrderCode(orderBean.getOid());
+        queryLineUpOrderDto.setThirdOrderCode(orderBean.getThirdOrderCode());
+        queryLineUpOrderDto.setThirdStoreId(orderBean.getThirdShopId());
+
         // 取餐排队人数查询代码去除
-        HexCloudTakeAwayOrderStatusDto statusDto = orderQueueIndexProcessorFactory.processor(orderBean.getCompanyId()).process(queryLineUpOrderReq);
+        HexCloudTakeAwayOrderStatusDto statusDto = orderQueueIndexProcessorFactory.processor(orderBean.getCompanyId()).process(queryLineUpOrderDto);
             if (null == statusDto) {
                 progress = "100";
                 returnWords = "";

order-application-service/src/main/java/cn/freemud/service/process/order/FreemudOrderQueueIndexProcessorImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.service.process.order;
 
 import cn.freemud.constant.CommonsConstant;
 import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.dto.order.QueryLineUpOrderDto;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudTakeAwayOrderStatusDto;
 import cn.freemud.utils.AppLogUtil;
 import com.freemud.application.sdk.api.ordercenter.request.QueryLineUpOrderReq;
@@ -37,10 +38,16 @@ public class FreemudOrderQueueIndexProcessorImpl extends AbstractQueueIndexProce
     }
 
     @Override
-    public HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderReq vo) {
+    public HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderDto vo) {
         AppLogUtil.infoLog("queryLineUpOrder from freemud ", vo, "");
+        QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
+        queryLineUpOrderReq.setPartnerId(vo.getPartnerId());
+        queryLineUpOrderReq.setStoreId(vo.getStoreId());
+        queryLineUpOrderReq.setStartTime(vo.getStartTime());
+        queryLineUpOrderReq.setEndTime(vo.getEndTime());
+
         // 查询订单的排队人数
-        QueryLineUpResponse response = orderCenterSdkService.queryLineUpOrder(vo);
+        QueryLineUpResponse response = orderCenterSdkService.queryLineUpOrder(queryLineUpOrderReq);
 
         if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(response.getErrcode())) {
             AppLogUtil.infoLog("queryLineUpOrder from freemud", vo, response);

order-application-service/src/main/java/cn/freemud/service/process/order/HexCloudOrderQueueIndexProcessorImpl.java

 package cn.freemud.service.process.order;
 
 import cn.freemud.constant.CommonsConstant;
+import cn.freemud.entities.dto.order.QueryLineUpOrderDto;
 import cn.freemud.service.thirdparty.hexcloud.HexCloudClient;
 import cn.freemud.service.thirdparty.hexcloud.request.HexCloudBaseRequest;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudBaseResponse;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudTakeAwayOrderStatusDto;
 import cn.freemud.utils.AppLogUtil;
-import com.freemud.application.sdk.api.ordercenter.request.QueryLineUpOrderReq;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -37,7 +37,7 @@ public class HexCloudOrderQueueIndexProcessorImpl extends AbstractQueueIndexProc
     }
 
     @Override
-    public HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderReq vo) {
+    public HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderDto vo) {
         AppLogUtil.infoLog("queryLineUpOrder from HexCloud", vo, "");
         if (StringUtils.isEmpty(vo.getThirdOrderCode())) {
             AppLogUtil.infoLog("合阔查询失败,ThirdOrderCode is empty", vo, "");
@@ -47,7 +47,7 @@ public class HexCloudOrderQueueIndexProcessorImpl extends AbstractQueueIndexProc
         Map<String, String> orderThirdCode = new HashMap<>();
         orderThirdCode.put("tp_order_id", vo.getThirdOrderCode());
         HexCloudBaseRequest request = HexCloudBaseRequest.builder().shopId(vo.getStoreId()).partnerId(vo.getPartnerId()).startTime(vo.getStartTime())
-                .endTime(vo.getEndTime()).oid(vo.getOrderCode()).data(orderThirdCode).build();
+                .endTime(vo.getEndTime()).oid(vo.getOrderCode()).data(orderThirdCode).thirdStoreId(vo.getThirdStoreId()).build();
 
         HexCloudBaseResponse<HexCloudTakeAwayOrderStatusDto> hexCloudBaseResponse = hexCloudClient.takeAwayOrderStatus(request);
         if (null != hexCloudBaseResponse && hexCloudBaseResponse.success()) {

order-application-service/src/main/java/cn/freemud/service/process/order/OrderQueueIndexProcessor.java

 package cn.freemud.service.process.order;
 
+import cn.freemud.entities.dto.order.QueryLineUpOrderDto;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudTakeAwayOrderStatusDto;
-import com.freemud.application.sdk.api.ordercenter.request.QueryLineUpOrderReq;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -28,5 +28,5 @@ public interface OrderQueueIndexProcessor {
      * @param vo
      * @return
      */
-    HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderReq vo);
+    HexCloudTakeAwayOrderStatusDto process(QueryLineUpOrderDto vo);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/hexcloud/HexCloudClientFallbackFactory.java

 package cn.freemud.service.thirdparty.hexcloud;
 
+import cn.freemud.entities.dto.order.QueryLineUpOrderDto;
 import cn.freemud.service.process.order.OrderQueueIndexProcessorFactory;
 import cn.freemud.service.thirdparty.hexcloud.request.HexCloudBaseRequest;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudBaseResponse;
 import cn.freemud.service.thirdparty.hexcloud.response.HexCloudTakeAwayOrderStatusDto;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.SpringBeanUtil;
-import com.freemud.application.sdk.api.ordercenter.request.QueryLineUpOrderReq;
 import feign.hystrix.FallbackFactory;
 import org.springframework.stereotype.Component;
 
@@ -33,7 +33,7 @@ public class HexCloudClientFallbackFactory implements FallbackFactory<HexCloudCl
         return new HexCloudClient() {
             @Override
             public HexCloudBaseResponse<HexCloudTakeAwayOrderStatusDto> takeAwayOrderStatus(HexCloudBaseRequest<Map<String, String>> baseRequest) {
-                QueryLineUpOrderReq vo = new QueryLineUpOrderReq();
+                QueryLineUpOrderDto vo = new QueryLineUpOrderDto();
                 vo.setStoreId(baseRequest.getShopId());
                 vo.setPartnerId(baseRequest.getPartnerId());
                 vo.setOrderCode(baseRequest.getOid());
@@ -42,7 +42,7 @@ public class HexCloudClientFallbackFactory implements FallbackFactory<HexCloudCl
                 //请求非码自己的排队号
                 OrderQueueIndexProcessorFactory factory = SpringBeanUtil.getBean(OrderQueueIndexProcessorFactory.class);
                 HexCloudTakeAwayOrderStatusDto statusDto = factory.commonProcessor().process(vo);
-                if (null!=statusDto){
+                if (null != statusDto) {
                     statusDto.setHexCloudResponse(false);
                 }
                 return HexCloudBaseResponse.buildSuccess(statusDto);

order-application-service/src/main/java/cn/freemud/service/thirdparty/hexcloud/request/HexCloudBaseRequest.java

@@ -39,6 +39,10 @@ public class HexCloudBaseRequest<T> {
      * 时间开始
      */
     private Long endTime;
+    /**
+     * 三方门店号
+     */
+    private String thirdStoreId;
 
     /**
      * 参数数据

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/QueryLineUpOrderReq.java

@@ -24,12 +24,4 @@ public class QueryLineUpOrderReq {
      * 时间开始
      */
     private Long endTime;
-    /**
-     * 订单号
-     */
-    private String orderCode;
-    /**
-     *　三方订单号
-     */
-    private String thirdOrderCode;
 }