Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into qa

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -124,5 +124,9 @@ public class PreviewOrderInfoVo {
      * svc卡支付描述
      */
     private String svcDiscountDesc;
+    /**
+     * 订单创建时间
+     */
+    private String createOrderTime;
 
 }

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

@@ -62,6 +62,7 @@ import com.google.common.collect.ImmutableMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.FastDateFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -118,6 +119,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
     private final String SESSION_KEY = "sessionKey";
+    private static FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
 
     @Override
     public BaseResponse createReserveOrder(CreateOrderVo createOrderVo) {
@@ -399,6 +401,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         //下单成功，保存下单版本号
         Integer orderUpdateVer = mealCacheManager.getIncrementOrderUpdateVersion(assortmentCustomerInfoVo.getPartnerId(),assortmentCustomerInfoVo.getStoreId(),assortmentCustomerInfoVo.getTableNumber());
         previewOrderInfoVo.setOrderUpdateVer(orderUpdateVer);
+        previewOrderInfoVo.setCreateOrderTime(dateFormat.format(new Date(queryOrderByIdResponse.getData().getGmtCreate())));
         //本次版本不考虑优惠券的使用
         return ResponseUtil.success(previewOrderInfoVo);
     }