雪花id返回给前端时使用String的格式

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -561,14 +561,15 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
      */
     private HotelOrderEntity userGetOrderById(Long orderId) {
         HotelOrderEntity orderEntity = this.getById(orderId);
-        if ("0".equalsIgnoreCase(orderEntity.getDeleteFlag())) {
-            throw new RRException(BizCodeEnume.PARAMETER_ERROR, "订单不存在，订单已删除");
-        }
 
         if (orderEntity == null) {
             throw new RRException(BizCodeEnume.PARAMETER_ERROR, "订单不存在，无效的orderId");
         }
 
+        if ("0".equalsIgnoreCase(orderEntity.getDeleteFlag())) {
+            throw new RRException(BizCodeEnume.PARAMETER_ERROR, "订单不存在，订单已删除");
+        }
+
         LoginUserDTO loginUserVO = LoginCheckAspect.threadLocal.get();
         String userFlag = loginUserVO.getCardNumber();
         if (!orderEntity.getUserFlag().equalsIgnoreCase(userFlag)) {

src/main/java/com/chuanghai/ihotel/vo/ConfirmOrderVO.java

@@ -34,6 +34,7 @@ public class ConfirmOrderVO {
     /**
      * 房间类型id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomTypeId;
     /**
      * 房间类型名称

src/main/java/com/chuanghai/ihotel/vo/OrderBillHandleVO.java

@@ -1,6 +1,7 @@
 package com.chuanghai.ihotel.vo;
 
 import com.chuanghai.ihotel.util.BigDecimalSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
@@ -15,10 +16,12 @@ public class OrderBillHandleVO {
     /**
      * 订单id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orderId;
     /**
      * 账单id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long billId;
     /**
      * 处理标识 1待退款、2待补缴

src/main/java/com/chuanghai/ihotel/vo/OrderSubmitVO.java

@@ -1,5 +1,6 @@
 package com.chuanghai.ihotel.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;
 import lombok.Data;
 
@@ -16,6 +17,7 @@ public class OrderSubmitVO {
     /**
      * 订单id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orderId;
     /**
      * 支付地址

src/main/java/com/chuanghai/ihotel/vo/RoomRealDataStatuVO.java

@@ -17,10 +17,12 @@ public class RoomRealDataStatuVO {
     /**
      * 房间id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomId;
     /**
      * 房态id，房态为1时该字段不会存在
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long statuId;
     /**
      * 当前状态 1空闲、2预定、3入住、4脏房、5锁定
@@ -36,6 +38,7 @@ public class RoomRealDataStatuVO {
         /**
          * 订单id
          */
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
         private Long orderId;
         /**
          * 客人姓名

src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java

@@ -1,6 +1,7 @@
 package com.chuanghai.ihotel.vo;
 
 import com.chuanghai.ihotel.util.BigDecimalSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
@@ -17,6 +18,7 @@ public class RoomTypeShortDescVO {
     /**
      * 房型id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
     /**
      * 房型名称

src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java

@@ -19,6 +19,7 @@ public class UserOrderDetailVO {
     /**
      * 订单id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
     /**
      * 订单编号
@@ -55,6 +56,7 @@ public class UserOrderDetailVO {
     /**
      * 房间id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomId;
     /**
      * 房间编号
@@ -63,6 +65,7 @@ public class UserOrderDetailVO {
     /**
      * 房型id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomTypeId;
     /**
      * 房型名称

src/main/java/com/chuanghai/ihotel/vo/UserOrderIndexVO.java

@@ -1,8 +1,11 @@
 package com.chuanghai.ihotel.vo;
 
+import com.chuanghai.ihotel.util.BigDecimalSerializer;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -17,23 +20,29 @@ public class UserOrderIndexVO {
     /**
      * 订单id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
     /**
      * 订单编号
      */
     private String orderNo;
     /**
-     * 入住时间
+     * 实际支付金额
+     */
+    @JsonSerialize(using = BigDecimalSerializer.class)
+    private BigDecimal payAmount;
+    /**
+     * 下单时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     /**
-     * 离店时间
+     * 入住时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime enableStartTime;
     /**
-     * 下单时间
+     * 离店时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime enableEndTime;
@@ -48,6 +57,7 @@ public class UserOrderIndexVO {
     /**
      * 房型id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomTypeId;
     /**
      * 房型名称