Commit 7a71fc29 by fm01154

外卖订单出餐后,更新pickUpTime字段

parent 56e53c9c
......@@ -9,12 +9,15 @@ import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.service.OrderBaseService;
import cn.freemud.management.service.handle.OrderVerifyHandle;
import cn.freemud.management.util.ResponseUtil;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
import com.freemud.application.sdk.api.ordercenter.request.TakeOutOrderPickUpTimeReq;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......@@ -32,6 +35,8 @@ public class OrderManagerAdapter {
@Autowired
private OrderBaseService orderBaseService;
@Autowired
private OrderSdkService orderSdkService;
@Autowired
private OrderBeanFactory orderBeanFactory;
@Value("${mccafe.partner.id}")
private String macCafePartnerId;
......@@ -80,6 +85,14 @@ public class OrderManagerAdapter {
return handleResponse(request, orderBean, verifyResponse);
}
BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDone(request, orderBean);
//更新外卖订单的pickUpTime
if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), orderManagerResponse.getCode())) {
String trackingNo = LogThreadLocal.getTrackingNo();
TakeOutOrderPickUpTimeReq takeOutOrderPickUpTimeReq = new TakeOutOrderPickUpTimeReq();
takeOutOrderPickUpTimeReq.setOrderCode(request.getOrderId());
orderSdkService.updateTakeOutOrderPickUpTime(takeOutOrderPickUpTimeReq,trackingNo);
}
return handleResponse(request, orderBean, orderManagerResponse);
}
......
......@@ -106,6 +106,12 @@ public class InterfaceAddressConstant {
* 通用订单状态修改
*/
public static final String UPDATE_ORDER_STATE = "order/v2/updateOrderState";
/**
* 外卖订单pickUpTime更新
*/
public static final String UPDATE_TAKEOUT_ORDER_PICK_UP_TIME = "order/v2/updateTakeOutOrderPickUpTime";
/**
* 批量 查询订单明细
*/
......
package com.freemud.application.sdk.api.ordercenter.request;
import lombok.Data;
@Data
public class TakeOutOrderPickUpTimeReq {
/**
* 订单号
*/
private String orderCode;
}
......@@ -379,6 +379,18 @@ public class OrderSdkService {
}
/**
* 修改外卖订单的pickUpTime
* @param request
* @return
*/
public OrderBaseResp updateTakeOutOrderPickUpTime(TakeOutOrderPickUpTimeReq request, String trackingNo){
OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.UPDATE_TAKEOUT_ORDER_PICK_UP_TIME,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
});
return responseHandle(responseDTO);
}
/**
* 已配送完成
*/
public OrderBaseResp prepareCompleteDelivery(POSOrderOperationBaseReq request, String trackingNo) {
......
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