Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -2694,7 +2694,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 mcCafePushOrderDto.setCancellationRemark(afterSalesOrderRespOptional.get().getReqRemark());
             }
         }
-        mcCafePushOrderDto.setAcceptTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss.SSS"));
+        mcCafePushOrderDto.setAcceptTime(StringUtils.isNotBlank(orderInfoReqs.getAcceptTime())?DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss.SSS"):"");
         mcCafePushOrderDto.setPickupCode(orderInfoReqs.getPickUpGoodsNo());
         mcCafePushOrderDto.setOpenId(orderExtInfoDto.getOpenid());
         GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto = new GetMemberInfoByIdRequestDto();