Commit 39d80ab8 by 徐康

Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳

parents 2973383b 4a1b8d73
...@@ -69,7 +69,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService { ...@@ -69,7 +69,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest(); DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
assemblyAckRequest.setOrderKey(request.getOrderId()); assemblyAckRequest.setOrderKey(request.getOrderId());
assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo()); assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(new Date())); assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
assemblyAckRequest.setStoreId(orderBean.getShopId()); assemblyAckRequest.setStoreId(orderBean.getShopId());
//入机成功通知配送 //入机成功通知配送
DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest); DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
......
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