Skip to content

O
order-group
Commit ded20a7f by 周晓航
Options

技术需求:所有请求基础服务接口新增商户号

parent 94c6f381
Showing with 106 additions and 67 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
......@@ -339,7 +339,7 @@ public interface OrderCenterSdkService {
* @param trackingNo
* @return
*/
QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo);
QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo, String partnerId);
/**
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -162,6 +162,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
}
@Override
@Deprecated
public CreateFatherSonOrderResponse createFatherSonOrder(CreateFatherSonOrderRequest createFatherSonOrderRequest) {
CreateFatherSonOrderReq request = orderSdkAdapter.convent2NEWCreateFatherSonOrderRequest(createFatherSonOrderRequest);
com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp<List<OrderInfoReqs>> baseResponse = orderSdkService.createFatherSonOrder(request, createFatherSonOrderRequest.getTrackingNo());
......@@ -506,7 +507,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Override
public QueryOrderByIdResponse queryOrderById(BaseQueryOrderRequest request) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo());
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo(),request.getPartnerId());
QueryOrderByIdResponse response = new QueryOrderByIdResponse();
if (orderInfo == null || orderInfo.getResult() == null) {
return response;
......@@ -538,7 +539,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Override
public QueryOrderByIdResponse queryMCCafeOrderById(BaseQueryOrderRequest request) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo());
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo(),request.getPartnerId());
QueryOrderByIdResponse response = new QueryOrderByIdResponse();
if (orderInfo == null || orderInfo.getResult() == null) {
return response;
......@@ -559,7 +560,13 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
return orderSdkAdapter.convent2QueryOrdersResponse(userorderResponse);
}
/**
* 接口废弃
* @param deleteOrderRequest
* @return
*/
@Override
@Deprecated
public BaseOrderResponse deleteOrder(DeleteOrderRequest deleteOrderRequest) {
OrderDeleteReq request = new OrderDeleteReq();
request.setOrderCode(deleteOrderRequest.getOrderId());
......@@ -1334,7 +1341,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Override
public OrderDetailResponse getByIdForParentProduct(BaseQueryOrderRequest request) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(), request.getThirdOrderCode(), 0, request.getTrackingNo());
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(), request.getThirdOrderCode(), 0, request.getTrackingNo(),request.getPartnerId());
OrderDetailResponse response = orderSdkAdapter.convent2OrderDetailResponse(orderInfo);
return response;
}
......@@ -1788,6 +1795,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(clearTableRequest.getTrackingNo());
baseQueryOrderRequest.setPartnerId(clearTableRequest.getPartnerId());
QueryOrderByIdResponse queryOrderByIdResponse = this.queryOrderById(baseQueryOrderRequest);
if (ObjectUtils.notEqual(queryOrderByIdResponse.getErrcode(), 100) || queryOrderByIdResponse.getData() == null) {
orderBaseResponse.setErrcode(queryOrderByIdResponse.getErrcode());
......@@ -1959,8 +1967,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
}
@Override
public QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfoByDownstream(downstreamPosCode, downstreamThirdOrderCode, trackingNo);
public QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo, String partnerId) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfoByDownstream(downstreamPosCode, downstreamThirdOrderCode, trackingNo, partnerId);
if (orderInfo == null || orderInfo.getResult() == null) {
return new QueryOrderByIdResponse();
}
......@@ -2374,7 +2382,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setOrderClient(orderClient.toString());
}
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), 1, request.getTrackingNo());
request.getThirdOrderCode(), 1, request.getTrackingNo(), partnerId);
return orderSdkAdapter.convent2OrderStateInfoResp(orderInfo);
}
......@@ -2424,7 +2432,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Override
public QueryByCodeResponse queryOrderByIdV2(BaseQueryOrderRequest request) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo());
request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo(), request.getPartnerId());
return orderInfo;
}
}
order-application-service/src/main/java/cn/freemud/manager/OrderManager.java
......@@ -24,7 +24,7 @@ public class OrderManager {
QueryOrderByIdResponse queryOrderByIdResponse = new QueryOrderByIdResponse();
String trackingNo = LogThreadLocal.getTrackingNo();
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo);
request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo,request.getPartnerId());
if(orderInfo != null){
queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode()));
queryOrderByIdResponse.setErrmsg(orderInfo.getMessage());
......
order-application-service/src/main/java/cn/freemud/service/CallerService.java
......@@ -78,6 +78,7 @@ public class CallerService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(vo.getPartnerId());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = queryOrderByIdResponse.getData();
if (Objects.isNull(orderBean)) {
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
......@@ -7,16 +7,16 @@ import cn.freemud.base.util.DateUtil;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.ecology.*;
import cn.freemud.entities.dto.pos.PosBaseRequestDto;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
import cn.freemud.entities.vo.order.DirectDeliveryReq;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.order.LogisticsList;
import cn.freemud.entities.vo.order.OrderPack;
import cn.freemud.enums.*;
import cn.freemud.enums.DeliveryStatus;
import cn.freemud.enums.MessageEventTypeEnum;
import cn.freemud.enums.MessageSceneEnum;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
import cn.freemud.management.enums.OperateType;
import cn.freemud.management.service.adapter.OrderManagerAdapter;
import cn.freemud.service.ThirdDeliveryService;
import cn.freemud.service.thirdparty.DeliveryFeiginClient;
......@@ -39,9 +39,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
......@@ -181,7 +179,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
}
sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
//推送异常到生态
sendException(request.getOrderId(), request.getExceptionDesc(), request.getUpdateTime(), DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc());
sendException(request.getOrderId(), request.getExceptionDesc(), request.getUpdateTime(), DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc(),partnerId);
// 取消外卖中台配送单 订单异常
// 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
// if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
......@@ -319,7 +317,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
@Override
public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) {
QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null);
QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null,null);
if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -394,7 +392,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
// pos获取回调状态
sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc());
//生态回调
sendException(request.getOrderId(), request.getErrorDesc(), request.getErrorCreateTime(), deliveryEarlyWarningMsg);
sendException(request.getOrderId(), request.getErrorDesc(), request.getErrorCreateTime(), deliveryEarlyWarningMsg,request.getPartnerId());
return ResponseUtil.success();
}
......@@ -489,6 +487,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(partnerId);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(response.getErrcode())) {
AppLogUtil.infoLog("麦咖啡订阅消息推送失败，查询订单信息失败:{} {}" ,null, JSON.toJSONString(response));
......@@ -544,6 +543,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
try {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = response.getData();
......@@ -607,10 +607,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
/**
* 通知生态发送调用消息
*/
public void sendException(String orderId, String unusualReason, String unusualTime, String desc) {
public void sendException(String orderId, String unusualReason, String unusualTime, String desc, String partnerId) {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(partnerId);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = response.getData();
SubscribeMessageRequest request = new SubscribeMessageRequest();
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -397,6 +397,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
//查询订单信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(createReserveOrderVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || queryOrderByIdResponse.getData() == null) {
......@@ -694,6 +695,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
//查询订单信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
queryTableStatusReponseVo = orderAdapter.conventTableStatusInfoByOrderInfo(queryOrderByIdResponse);
......
order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java
......@@ -58,7 +58,7 @@ public class EvaluationServiceImpl implements EvaluationService {
public BaseResponse userOrderEvaluationNew(AddUserOrderEvaluationNewRequestVo request) {
OrderEvaluationStatus orderEvaluationStatus = new OrderEvaluationStatus(EvaluationStatus.SUCCESS.getCode());
try {
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo());
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo(),request.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -187,7 +187,7 @@ public class EvaluationServiceImpl implements EvaluationService {
return ResponseUtil.success(new OrderEvaluationStatus(2));
}
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo());
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo(),request.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "")
|| orderDetailResponse.getResult() == null || StringUtils.isEmpty(orderDetailResponse.getResult().getOrderCode())) {
return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -1164,6 +1164,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderRefundVo.getOid());
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -2267,6 +2268,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(oid);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(userLoginInfoDto.getPartnerId());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
......@@ -2319,6 +2321,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(reminderVo.getOid());
baseQueryOrderRequest.setPartnerId(userLoginInfoDto.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -198,6 +198,7 @@ public class MallOrderServiceImpl implements MallOrderService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(requestVO.getOid());
baseQueryOrderRequest.setTrackingNo(trackingNo);
baseQueryOrderRequest.setPartnerId(requestVO.getPartnerId());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
// 判断订单信息是否存在
BaseResponse baseResponse = this.checkOrder(response, requestVO.getPartnerId());
......@@ -860,6 +861,7 @@ public class MallOrderServiceImpl implements MallOrderService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(editAfterSalesExpressVo.getOid());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(userInfo.getPartnerId());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean;
if (queryOrderByIdResponse == null || !RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || (orderBean = queryOrderByIdResponse.getData()) == null) {
......@@ -990,6 +992,7 @@ public class MallOrderServiceImpl implements MallOrderService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(requestVO.getOid());
baseQueryOrderRequest.setTrackingNo(trackingNo);
baseQueryOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
// 判断订单信息是否存在
BaseResponse baseResponse = this.checkOrder(response, requestVO.getPartnerId());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
......@@ -418,7 +418,7 @@ public class OrderAdapterServiceImpl {
// 增加全局开关，当紧急方案打开时进行直接处理callBack消息
if (orderBean != null && orderCenterProperties.isUrgentCallbackOpen()) {
// 查询
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 2, null, null);
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 2, null, null,message.getPartnerId());
ApiLog.infoMessage("紧急方案 支付成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId());
orderCallbackClient.callbackOrder(requestVo);
}
......@@ -522,7 +522,7 @@ public class OrderAdapterServiceImpl {
Map<String, Object> respMsg = new LinkedHashMap<>();
for (String orderCode : request.getOrderCodes()) {
// 校验订单
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo());
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo(),assortmentCustomerInfoVo.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
respMsg.put(orderCode, "订单不存在");
continue;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -1343,6 +1343,7 @@ public class OrderServiceImpl implements Orderservice {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(requestVo.getOid());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(userLoginInfoDto.getPartnerId());
baseQueryOrderRequest.setWithOperationHistory(1);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
......@@ -1776,6 +1777,7 @@ public class OrderServiceImpl implements Orderservice {
}
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(deleteOrderVo.getOid());
baseQueryOrderRequest.setPartnerId(deleteOrderVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -1832,6 +1834,7 @@ public class OrderServiceImpl implements Orderservice {
}
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(deleteOrderVo.getOid());
baseQueryOrderRequest.setPartnerId(deleteOrderVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -1891,6 +1894,7 @@ public class OrderServiceImpl implements Orderservice {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderRefundVo.getOid());
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -2177,7 +2181,7 @@ public class OrderServiceImpl implements Orderservice {
List<RefundReasonResponseVo> refundReasonResponseVos = getRefundReasonResponseVos(getRefundReasonVo);
result.setRefundReasons(refundReasonResponseVos);
assert userInfo != null;
String refundDocument = buildRefundDocument(oid);
String refundDocument = buildRefundDocument(oid, userInfo.getPartnerId());
result.setRefundDocument(refundDocument);
return ResponseUtil.success(result);
}
......@@ -2208,8 +2212,8 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.success();
}
private String buildRefundDocument(String oid) {
QueryOrderByIdResponseDto response = getQueryOrderByIdResponseDto(oid);
private String buildRefundDocument(String oid, String partnerId) {
QueryOrderByIdResponseDto response = getQueryOrderByIdResponseDto(oid, partnerId);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
throw new ServiceException(ResponseResult.ORDER_QUERYORDER_ERROR);
}
......@@ -2231,9 +2235,10 @@ public class OrderServiceImpl implements Orderservice {
return document;
}
private QueryOrderByIdResponseDto getQueryOrderByIdResponseDto(String oid) {
private QueryOrderByIdResponseDto getQueryOrderByIdResponseDto(String oid, String partnerId) {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(oid);
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -3359,7 +3364,7 @@ public class OrderServiceImpl implements Orderservice {
orderRefundVo.setReason("退款");
}
// 查询订单
BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(orderRefundVo.getOid());
BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(orderRefundVo.getOid(),orderRefundVo.getPartnerId());
if (!Objects.equals(orderResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return orderResponse;
}
......@@ -3508,7 +3513,7 @@ public class OrderServiceImpl implements Orderservice {
QueryRefundFailuresListDto queryRefundFailuresListDto = queryRefundFailuresListDtoBaseResponse.getResult().get(0);
// 查询订单
BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(queryRefundFailuresListDto.getOrderCode());
BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(queryRefundFailuresListDto.getOrderCode(),queryRefundFailuresListDto.getPartnerId());
if (!Objects.equals(orderResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单数据查询失败：" + orderResponse.getMessage());
}
......@@ -3625,6 +3630,7 @@ public class OrderServiceImpl implements Orderservice {
// 查询订单
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderCode);
baseQueryOrderRequest.setPartnerId(orderRefundVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
......@@ -3901,12 +3907,13 @@ public class OrderServiceImpl implements Orderservice {
* @param oid
* @return
*/
private BaseResponse<OrderBeanV1> checkOrderAndGetOrderBean(String oid) {
private BaseResponse<OrderBeanV1> checkOrderAndGetOrderBean(String oid, String partnerId) {
if (StringUtils.isBlank(oid)) {
return ResponseUtil.error(ResponseResult.ORDER_CODE_EMPTY);
}
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(oid);
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
......
order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java
......@@ -414,7 +414,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
}
String orderCode = queryOrderVo.getOid();
QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo("", orderCode, "", null, LogThreadLocal.getTrackingNo());
QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo("", orderCode, "", null, LogThreadLocal.getTrackingNo(),userLoginInfoDto.getPartnerId());
if (null == queryByCodeResponse || null == queryByCodeResponse.getResult()) {
return ResponseUtil.success();
......
order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java
......@@ -26,8 +26,8 @@ public class DeliveryOrderController {
@ApiOperation(value = "创建配送单", notes = "创建配送单", produces = "application/json")
@GetMapping("/delivery/create")
public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode
, @RequestParam(value = "operator", required = false) String operator) {
return orderDeliveryService.createDelivery(orderCode, operator);
, @RequestParam(value = "operator", required = false) String operator, @RequestParam(value = "partnerId", required = false) String partnerId) {
return orderDeliveryService.createDelivery(orderCode, operator,partnerId);
}
......
order-management/src/main/java/cn/freemud/management/entities/dto/request/delivery/DeliveryOrderRequest.java
......@@ -11,4 +11,5 @@ public class DeliveryOrderRequest {
private String orderCode;
private String operator;
private String partnerId;
}
order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
......@@ -44,7 +44,7 @@ public class OrderBaseService {
@Autowired
private OrderServiceV1 serviceV1;
public OrderBeanV1 getByOrderCode(String orderCode) {
public OrderBeanV1 getByOrderCode(String orderCode, String partnerId) {
// BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest();
// queryRequest.setOrderId(orderCode);
// QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest);
......@@ -53,7 +53,7 @@ public class OrderBaseService {
// }
// return response.getData();
String trackingNo = LogThreadLocal.getTrackingNo();
return serviceV1.queryOrderById(null,orderCode,null,null,trackingNo);
return serviceV1.queryOrderById(null, orderCode, null, null, trackingNo, partnerId);
}
public void sendMessage(OrderBeanV1 orderBean, OperateType opType, String reason) {
......@@ -72,10 +72,10 @@ public class OrderBaseService {
MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
try {
messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType);
if (messageTemplateRequest!=null && messageTemplateRequest.getMessageEventType() != null) {
if (messageTemplateRequest != null && messageTemplateRequest.getMessageEventType() != null) {
BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
if(baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())){
ApiLog.printLog("sendTemplateMsg",orderBean.getOid(), JSONObject.toJSONString(baseResponse),null);
if (baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())) {
ApiLog.printLog("sendTemplateMsg", orderBean.getOid(), JSONObject.toJSONString(baseResponse), null);
}
}
} catch (Exception e) {
......@@ -92,9 +92,9 @@ public class OrderBaseService {
* @param orderCode
* @param deliveryId
*/
public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator,String msg) {
public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator, String msg) {
AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder()
.abnormalDesc("配送异常"+ msg)
.abnormalDesc("配送异常" + msg)
.deliveryId(deliveryId)
.orderCode(orderCode)
.partnerId(partnerId)
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
......@@ -45,7 +45,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse<OrderManagerResponse> orderConfirmTake(OrderManagerRequest request) {
//查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId());
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage());
}
......@@ -70,7 +70,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -91,7 +91,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (Objects.isNull(orderBean)) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -119,7 +119,7 @@ public class OrderManagerAdapter {
public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
if (orderBean == null) {
//查询订单
orderBean = orderBaseService.getByOrderCode(request.getOrderId());
orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -141,7 +141,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderReject(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -171,7 +171,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderAgreeRefund(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -222,7 +222,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderRejectRefund(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -250,7 +250,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderCancel(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -327,7 +327,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderCreateDelivery(OrderManagerRequest request) {
//查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId());
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage());
}
......@@ -340,9 +340,9 @@ public class OrderManagerAdapter {
return handleResponse(request, orderBean, orderManagerResponse);
}
private BaseResponse<OrderBeanV1> getOrderBean(String orderId) {
private BaseResponse<OrderBeanV1> getOrderBean(String orderId, String partnerId) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderId);
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderId,partnerId);
// 防止NPE
if (orderBean == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
......@@ -358,7 +358,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse orderCancelDelivery(OrderManagerRequest request) {
//查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId());
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage());
}
......@@ -375,7 +375,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse developRefund(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -394,7 +394,7 @@ public class OrderManagerAdapter {
*/
public BaseResponse refundSuccessCallback(RefundSuccessCallbackVo request) {
// step 1 查订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderCode());
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderCode(),request.getPartnerId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
......@@ -399,11 +399,11 @@ public class SaasOrderHandle {
* @param msgType 消息类型 MsgType() 1:订单信息变化通知通知
* @return
*/
public OrderCallBackRequestVo convert2CallbackReq(String orderCode, Integer orderState, Integer operateType, String msgType) {
public OrderCallBackRequestVo convert2CallbackReq(String orderCode, Integer orderState, Integer operateType, String msgType, String partnerId) {
OrderCallBackRequestVo notifyDto = new OrderCallBackRequestVo();
//直接查询基础服务获取订单信息
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null, orderCode, null,
null, LogThreadLocal.getTrackingNo());
null, LogThreadLocal.getTrackingNo(),partnerId);
if (orderInfo == null) {
return null;
}
......
order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java
......@@ -37,8 +37,8 @@ public class OrderDeliveryService {
* @param orderCode
* @return
*/
public BaseResponse createDelivery(String orderCode, String operator) {
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderCode);
public BaseResponse createDelivery(String orderCode, String operator, String partnerId) {
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderCode,partnerId);
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......@@ -59,7 +59,7 @@ public class OrderDeliveryService {
* @return
*/
public BaseResponse cancelDeliveryOrder(DeliveryOrderRequest request) {
OrderBeanV1 data = orderBaseService.getByOrderCode(request.getOrderCode());
OrderBeanV1 data = orderBaseService.getByOrderCode(request.getOrderCode(),request.getPartnerId());
if (null == data) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
......
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
......@@ -143,7 +143,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
}
// 增加全局开关，当紧急方案打开时进行直接处理callBack消息
if (orderCenterProperties.isUrgentCallbackOpen()) {
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 3, null, null);
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 3, null, null, request.getPartnerId());
ApiLog.infoMessage("紧急方案 接单成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId());
orderCallbackClient.callbackOrder(requestVo);
}
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
......@@ -7,6 +7,7 @@ public class InterfaceAddressConstant {
//创建订单
public static final String CREATE_ORDER = "order/v2/create";
//创建父子订单
@Deprecated
public static final String CREATE_FATHER_ORDER = "order/v2/createRelatedOrders";
//根据订单CODE查询订单详细信息
public static final String GET_ORDER_INFO = "order/v2/queryByCode";
......@@ -19,8 +20,10 @@ public class InterfaceAddressConstant {
//支付成功
public static final String MCCAFE_COLLECT_ORDER = "order/v2/mcCafe/syncPos";
//父子订单支付成功
@Deprecated
public static final String FATHER_ORDER_PAY_SUCCESS = "/order/v2/relatedOrdersPaySuccess";
//删除订单
@Deprecated
public static final String DELETE_ORDER = "order/v2/delete";
//取消整个订单
public static final String CANCEL_ORDER = "order/v2/cancel";
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderAffirmReq.java
......@@ -80,4 +80,9 @@ public class ParkingOrderAffirmReq {
/*******商户名称****/
private String partnerName;
/**
* 商户号 必传字段
*/
private String partnerId;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCancelReq.java
......@@ -11,4 +11,5 @@ public class ParkingOrderCancelReq {
private String orderCode;
private String operator;
private String cancelReason;
private String partnerId;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
......@@ -85,7 +85,9 @@ public class OrderSdkService {
/**
* 创建父子订单
* 废弃接口
*/
@Deprecated
public OrderBaseResp<List<OrderInfoReqs>> createFatherSonOrder(CreateFatherSonOrderReq request, String trackingNo) {
OrderBaseResp<List<OrderInfoReqs>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.CREATE_FATHER_ORDER,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<List<OrderInfoReqs>>>() {
......@@ -124,7 +126,7 @@ public class OrderSdkService {
* @param trackingNo 交易号
* @return
*/
public QueryByCodeResponse getOrderInfo(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo) {
public QueryByCodeResponse getOrderInfo(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo, String partnerId) {
String url = InterfaceAddressConstant.GET_ORDER_INFO + "?";
if (orderClient != null) {
url = url + "orderClient=" + orderClient + "&";
......@@ -138,6 +140,7 @@ public class OrderSdkService {
if (withOperationHistory != null && withOperationHistory == 1) {
url = url + "withOperationHistory=" + withOperationHistory;
}
url = this.appendParams(url, partnerId);
QueryByCodeResponse responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, url,
createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
});
......@@ -833,9 +836,10 @@ public class OrderSdkService {
* @param trackingNo 交易号
* @return
*/
public QueryByCodeResponse getOrderInfoByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo) {
public QueryByCodeResponse getOrderInfoByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo, String partnerId) {
String url = InterfaceAddressConstant.GET_ORDER_INFO_DOWNSTREAM + "?";
url = url + "downstreamPosCode=" + downstreamPosCode + "&" + "downstreamThirdOrderCode=" + downstreamThirdOrderCode + "&";
url = url + "downstreamPosCode=" + downstreamPosCode + "&" + "downstreamThirdOrderCode=" + downstreamThirdOrderCode;
url = this.appendParams(url, partnerId);
QueryByCodeResponse responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, url,
createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
});
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderServiceV1.java
......@@ -19,8 +19,8 @@ public class OrderServiceV1 {
* 根据订单编号查询订单信息
* 返回 V1版本订单数据结构
*/
public OrderBeanV1 queryOrderById(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo){
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, withOperationHistory, trackingNo);
public OrderBeanV1 queryOrderById(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo,String partnerId){
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, withOperationHistory, trackingNo,partnerId);
if(orderInfo == null || orderInfo.getResult() == null || StringUtils.isEmpty(orderInfo.getResult().getOrderCode())){
return null;
}
......
ordercenter-sdk/src/test/java/com/freemud/application/sdk/api/ordercenter/service/TestApiService.java
......@@ -425,7 +425,7 @@ public class TestApiService {
String orderClient = "11";
String orderCode = null;
String thirdOrderCode = "27003913648267755";
QueryByCodeResponse response = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, 0, "");
QueryByCodeResponse response = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, 0, "","");
System.out.println(JSON.toJSONString(response));
}
......
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