Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

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