Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop

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

@@ -229,7 +229,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getCode()+" "+couponLockResponseBaseResponse.getMessage());
+                return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getMessage());
             }
         }
 

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

@@ -123,6 +123,25 @@ public class OrderDownLoadSdkService {
         QueryByCodeResponse queryResponse = RequestThirdPartyUtils.httpGetReqComplex(this.restTemplate, url
                 , createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
                 });
+
+        return queryResponse;
+    }
+
+    /**
+     * 根据订单号查询订单详情
+     *
+     * @param partnerId
+     * @param orderCode
+     * @param trackingNo
+     * @param orderCode
+     * @param trackingNo
+     * @return
+     */
+    public QueryByCodeResponse queryOrderByCode(String partnerId, String orderCode, String trackingNo,Long startTimestamp,Long endTimestamp) {
+        String url = InterfaceAddressConstant.QUERY_ORDER_BY_CODE + "?orderCode=" + orderCode + "&partnerId=" + partnerId+ "&startTimestamp=" + startTimestamp+ "&endTimestamp=" + endTimestamp;
+        QueryByCodeResponse queryResponse = RequestThirdPartyUtils.httpGetReqComplex(this.restTemplate, url
+                , createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
+                });
         return queryResponse;
     }