修改数据统计

share-system/src/main/java/share/system/domain/vo/OrderVo.java

@@ -16,6 +16,15 @@ public class OrderVo {
 
     private Long consumerId;
 
+    /**
+     * 用户手机号
+     */
+    private String consumerPhone;
+
+    private String nickName;
+
+    private String avatar;
+
     private Long storeId;
 
     private Long roomId;
@@ -94,6 +103,9 @@ public class OrderVo {
     private String packName;
     //优惠卷名称
     private String couponName;
+    private String couponCode;
+    private Integer platformType;
+    private BigDecimal couponPayPrice;
 
     //订单状态
     private Integer orderType;
@@ -113,10 +125,12 @@ public class OrderVo {
     private Integer status;
 
     private BigDecimal payPrice;
+
     private BigDecimal duration;
 
     private BigDecimal balance;
 
     private BigDecimal discountRatio;
 
+
 }

share-system/src/main/java/share/system/response/OrderStatisticsResponse.java

@@ -2,8 +2,10 @@ package share.system.response;
 
 import lombok.Data;
 import share.system.domain.SOrder;
+import share.system.domain.vo.OrderVo;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -49,6 +51,7 @@ public class OrderStatisticsResponse {
     //积分退款
     private BigDecimal integralRefundFee = BigDecimal.ZERO;
     //订单集合
-    private List<SOrder> orderList;
+    private List<SOrder> orderList = new ArrayList<>();
+    private List<OrderVo> orderVoList = new ArrayList<>();
 
 }

share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java

@@ -112,7 +112,7 @@ public class RoomStatusServiceImpl implements RoomStatusService {
                     queryWrapper.ge(SOrder::getEndDate, DateUtils.addMinutes(DateUtils.getNowDate(), -15));
                     SOrder one = orderService.getOne(queryWrapper);
                     if (ObjectUtils.isEmpty(one)) {
-                        isAvailable = false;
+                        isAvailable = true;
                     } else {
                         isAvailable = true;
                     }
@@ -298,7 +298,9 @@ public class RoomStatusServiceImpl implements RoomStatusService {
                     }else{
                         if (!ObjectUtils.isEmpty(orderId)) {
                             if (!order.getId().equals(orderId)) {
-                                orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROOM_LOCK_DELAY_MINUTE);
+                                if (order.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
+                                    orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.OPEN_DOOR_AHEAD_HOUR);
+                                }
                             }
                         } else {
                             orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROOM_LOCK_DELAY_MINUTE);