Commit 0f654715 by 姜海波

客如云接口

parent 5ef1ac37
...@@ -2292,6 +2292,14 @@ public class OrderSdkAdapter { ...@@ -2292,6 +2292,14 @@ public class OrderSdkAdapter {
return sdkNewOrderUpdateThirdOrderCodeReq; 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) { public BaseOrderResponse convent2NewOrderUpdateThirdOrderCode(BaseResponse updateThirdOrderCode) {
BaseOrderResponse baseOrderResponse = new BaseOrderResponse(); BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 500); baseOrderResponse.setErrcode(updateThirdOrderCode.getCode() != null ? Integer.parseInt(updateThirdOrderCode.getCode()) : 500);
......
...@@ -292,4 +292,23 @@ public interface OrderCenterSdkService { ...@@ -292,4 +292,23 @@ public interface OrderCenterSdkService {
* @return * @return
*/ */
QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo); 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);
} }
...@@ -1321,6 +1321,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1321,6 +1321,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
} }
@Override @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) { public QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo) {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response com.freemud.application.sdk.api.ordercenter.response.BaseResponse response
...@@ -1328,6 +1344,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1328,6 +1344,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
return orderSdkAdapter.convent2QueryOrdersResponse(response); 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){ private void setTimeout(BaseQueryOrderRequest baseQueryOrderRequest,POSOrderOperationBaseReq request){
String partnerId = baseQueryOrderRequest.getPartnerId(); String partnerId = baseQueryOrderRequest.getPartnerId();
String storeCode = baseQueryOrderRequest.getShopId(); String storeCode = baseQueryOrderRequest.getShopId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment