Merge remote-tracking branch 'remotes/origin/feature-2020/5/14-1.9.23-客如云增加查询修改接口-海波'

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.5.2.RELEASE</version>
+    <version>1.5.3.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.2.11.RELEASE</version>
+            <version>1.3.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -51,4 +51,5 @@
 | 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |
 | 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
 | 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
-| 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
\ No newline at end of file
+| 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
+| 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -900,6 +900,8 @@ public class OrderSdkAdapter {
         data.setThirdOrderCode(orderInfoReqs.getThirdOrderCode());
         data.setDinersNumber(orderInfoReqs.getDinersNumber());
         data.setThirdShopId(orderInfoReqs.getThirdStoreId());
+        data.setDownstreamPosCode(orderInfoReqs.getDownstreamPosCode());
+        data.setDownstreamThirdOrderCode(orderInfoReqs.getDownstreamThirdOrderCode());
 
         if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) {
             data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0));
@@ -2305,6 +2307,14 @@ public class OrderSdkAdapter {
         return sdkNewOrderUpdateThirdOrderCodeReq;
     }
 
+    public UpdateDownstreamOrderCodeReq convert2NewOrderUpdateDownstreamThirdOrderCodeReq(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest) {
+        UpdateDownstreamOrderCodeReq codeReq = new UpdateDownstreamOrderCodeReq();
+        codeReq.setOrderCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getOrderCode());
+        codeReq.setDownstreamPosCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getDownstreamPosCode());
+        codeReq.setDownstreamThirdOrderCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getDownstreamThirdOrderCode());
+        return codeReq;
+    }
+
     public BaseOrderResponse convent2NewOrderUpdateThirdOrderCode(BaseResponse updateThirdOrderCode) {
         BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
         baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 500);

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateDownstreamThirdOrderCodeRequest.java

+package com.freemud.sdk.api.assortment.order.request.order;
+
+import com.freemud.sdk.api.assortment.order.config.BaseConfig;
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: ${FILE_NAME}
+ * @Package com.freemud.mail.core
+ * @Description: ${TODO}(用一句话描述该文件做什么)
+ * @author: aiqi.gong
+ * @date: 2019/7/18 18:43
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class AssortmentSdkUpdateDownstreamThirdOrderCodeRequest extends BaseConfig {
+    private String orderCode;
+    private String downstreamPosCode;
+    private String downstreamThirdOrderCode;
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -355,6 +355,16 @@ public class QueryOrdersResponse {
              * 完成时间
              */
             private  Long  gmtCompleteTime;
+            /**
+             * 下游POS商编号
+             */
+            private String downstreamPosCode;
+
+            /**
+             * 下游订单号
+             */
+            private String downstreamThirdOrderCode;
+
 
             @NoArgsConstructor
             @Data

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

@@ -292,4 +292,23 @@ public interface OrderCenterSdkService {
      * @return
      */
     QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo);
+
+
+    /**
+     * 根据下游POS信息查询订单
+     * @param downstreamPosCode
+     * @param downstreamThirdOrderCode
+     * @param trackingNo
+     * @return
+     */
+    QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo);
+
+
+    /**
+     * 订单更新下游POS信息
+     * @param assortmentSdkUpdateDownstreamThirdOrderCodeRequest
+     * @return
+     */
+    BaseOrderResponse updateThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
+
 }

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

@@ -1349,6 +1349,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
+    public QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo) {
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfoByDownstream(downstreamPosCode,downstreamThirdOrderCode,trackingNo);
+        if (orderInfo == null || orderInfo.getResult() == null) {
+            return new QueryOrderByIdResponse();
+        }
+        QueryOrderByIdResponse response = new QueryOrderByIdResponse();
+        response.setErrcode(Integer.parseInt(orderInfo.getCode()));
+        response.setErrmsg(orderInfo.getMessage());
+        if (StringUtils.isEmpty(orderInfo.getResult().getOrderCode())) {
+            return response;
+        }
+        QueryOrderByIdResponse orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(orderInfo);
+        return orderByIdResponse;
+    }
+
+    @Override
     public QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo) {
 
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response
@@ -1356,6 +1372,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return orderSdkAdapter.convent2QueryOrdersResponse(response);
     }
 
+    @Override
+    public BaseOrderResponse updateThirdOrderCode(AssortmentSdkUpdateDownstreamThirdOrderCodeRequest assortmentSdkUpdateDownstreamThirdOrderCodeRequest) {
+        UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = orderSdkAdapter.convert2NewOrderUpdateDownstreamThirdOrderCodeReq(assortmentSdkUpdateDownstreamThirdOrderCodeRequest);
+        return orderSdkAdapter.convent2NewOrderUpdateThirdOrderCode(orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getTrackingNo()));
+    }
+
     private void setTimeout(BaseQueryOrderRequest baseQueryOrderRequest,POSOrderOperationBaseReq request){
         String partnerId = baseQueryOrderRequest.getPartnerId();
         String storeCode = baseQueryOrderRequest.getShopId();

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.11.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -29,4 +29,5 @@
 | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
-| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file
+| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
+| 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file

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

@@ -166,4 +166,14 @@ public class InterfaceAddressConstant {
      * 订单管理
      */
     public static final String STATUS_OPERATE="order/statusOperate";
+
+    /**
+     *修改下游POS商订单数据
+     */
+    public static final String UPDATE_DOWNSTREAM_THIRD_ORDER_CODE = "order/v2/updateDownstreamOrderCode";
+
+    /**
+     * 根据订单下游POS数据查询订单
+     */
+    public static final String GET_ORDER_INFO_DOWNSTREAM = "order/v2/queryOrderByDownstream";
 }

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

+package com.freemud.application.sdk.api.ordercenter.request;
+
+import lombok.Data;
+
+/**
+ * @author haibo.jiang
+ * @Description:
+ * @date 2019/7/18 16:20
+ */
+@Data
+public class UpdateDownstreamOrderCodeReq {
+
+    private String orderCode;
+
+    private String downstreamPosCode;
+
+    private String downstreamThirdOrderCode;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -258,5 +258,14 @@ public class OrderInfoReqs {
     //订单扩展信息 （门店渠道信息）
     private OrderExtendedReq orderExtended;
 
+    /**
+     * 下游POS商编号
+     */
+    private String downstreamPosCode;
+
+    /**
+     * 下游订单号
+     */
+    private String downstreamThirdOrderCode;
 
 }

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

@@ -712,4 +712,33 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * @param
+     * @param trackingNo
+     * @return
+     */
+    public BaseResponse updateDownstreamThirdOrderCode(UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.UPDATE_DOWNSTREAM_THIRD_ORDER_CODE,
+                createBaseRequest(updateDownstreamOrderCodeReq, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+    /**
+     * 查询单个订单详情
+     *
+     * @param downstreamPosCode          下单渠道
+     * @param downstreamThirdOrderCode            订单号
+     * @param trackingNo           交易号
+     * @return
+     */
+    public QueryByCodeResponse getOrderInfoByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo) {
+        String url = InterfaceAddressConstant.GET_ORDER_INFO_DOWNSTREAM + "?";
+        url = url + "downstreamPosCode=" + downstreamPosCode + "&" + "downstreamThirdOrderCode=" + downstreamThirdOrderCode + "&";
+        QueryByCodeResponse responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, url,
+                createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
+                });
+        return responseDTO;
+    }
+
 }