订单详情走聚合sdk修改

order-application-service/src/main/java/cn/freemud/manager/OrderManager.java

+package cn.freemud.manager;
+
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
+import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
+import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderManager {
+
+    @Autowired
+    private OrderSdkService orderSdkService;
+
+    @Autowired
+    private OrderCenterSdkAdapter orderCenterSdkAdapter;
+
+    public QueryOrderByIdResponse queryOrderById(BaseQueryOrderRequest request){
+        QueryOrderByIdResponse queryOrderByIdResponse = new QueryOrderByIdResponse();
+        String trackingNo =  LogThreadLocal.getTrackingNo();
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
+                request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo);
+        if(orderInfo != null){
+            queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode()));
+            queryOrderByIdResponse.setErrmsg(orderInfo.getMessage());
+        }
+        if(orderInfo != null && orderInfo.getResult() != null){
+            OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfo.getResult());
+            queryOrderByIdResponse.setData(orderBeanV1);
+        }
+        return queryOrderByIdResponse;
+    }
+
+}

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

@@ -55,6 +55,7 @@ import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
 import cn.freemud.management.service.handle.ActivityHandle;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.manager.BuyProductOnceManager;
+import cn.freemud.manager.OrderManager;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.manager.SpellGroupOrderDataManager;
 import cn.freemud.redis.RedisCache;
@@ -323,6 +324,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private BuyProductOnceManager buyProductOnceManager;
 
+    @Autowired
+    private OrderManager orderManager;
+
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1390,7 +1394,7 @@ public class OrderServiceImpl implements Orderservice {
         baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         // 订单详情要查询3个月前的订单
         // 先实时查询如果没有查询es
-        QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        QueryOrderByIdResponse response = orderManager.queryOrderById(baseQueryOrderRequest);
 
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
 //            AppLogUtil.infoLog("订单详情实时查询错误，baseQueryOrderRequest，", baseQueryOrderRequest, "");

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -184,6 +184,7 @@ public class OrderCenterSdkAdapter {
         data.setSource(OrderSourceV1.getCodeByClientType(orderInfoReqs.getOrderClient()));
         data.setSourceName(OrderSourceV1.getDescByClientType(orderInfoReqs.getOrderClient()));
         data.setStatus(OrderStatusV1.getOldCode(orderInfoReqs.getOrderState()));
+        data.setStatusV2(orderInfoReqs.getOrderState());
         data.setQueueIndex("");
         data.setUserType("");
         data.setOperateTakeOrderTime(null);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java

@@ -186,6 +186,8 @@ public class OrderBeanV1 {
      * 订单状态  1 下单 2 待支付 3已接单 4 配送中 5 已完成 6 已取消 7 已拒单 31 制作完成
      */
     private Integer status;
+
+    private Integer statusV2;
     /**
      * 取餐地址
      */