Skip to content

O
order-group
Commit 6dab277d by huiyang.chen
Options

fix 外卖单才同步配送取餐码

parent 55738b82
Showing with 12 additions and 10 deletions
order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
...@@ -72,16 +72,18 @@ public class McCafeMangerServiceImpl implements OrderManagerService { ...@@ -72,16 +72,18 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED); return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
} }
SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
assemblyAckRequest.setOrderKey(request.getOrderId()); DeliveryOrderAssemblyackRequest assemblyAckRequest = new DeliveryOrderAssemblyackRequest();
assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo()); assemblyAckRequest.setOrderKey(request.getOrderId());
assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8))); assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
assemblyAckRequest.setStoreId(orderBean.getShopId()); assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
//入机成功通知配送 assemblyAckRequest.setStoreId(orderBean.getShopId());
DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest); //入机成功通知配送
if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) { DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR); if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode() + "")) {
return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
}
} }
} }
if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) { if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
......
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