Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1196,7 +1196,7 @@ public class OrderAdapter {
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
             }
-            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus())) {
+            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus()) && null != ordersBean.getGmtCompleteTime() && 0l != ordersBean.getGmtCompleteTime()) {
                 responseVo.setCompleteTime(DateUtil.convert2String(new Date(ordersBean.getGmtCompleteTime()), "yyyy-MM-dd HH:mm:ss"));
             }
             responseVo.setTakeMealFlows(getTakeMealFlows(ordersBean));