order list bugfix;

computer order bugfix;

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

@@ -314,12 +314,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             case RESERVER://预定
                 //订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内
                 //订单结束时间在 【预定开始时间-30分钟保洁 和 预定结束时间】区间内
-                queryWrapper.apply("IFNULL(start_date,pre_start_date) BETWEEN '"
+                queryWrapper.apply("(IFNULL(start_date,pre_start_date) BETWEEN '"
                         + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreStartDate())
                         + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' " +
                         "OR IFNULL(end_date,pre_end_date) BETWEEN '"
                         + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreStartDate(), -Constants.ROOM_LOCK_DELAY_MINUTE))
-                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' ");
+                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' )");
                 break;
             case RENEW://续费
                 if (StringUtils.isBlank(request.getPreOrderNo())) {
@@ -782,14 +782,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         // 计算各种价格
         ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse();
         SRoom room = roomService.getById(request.getRoomId());
-        BigDecimal totalPrice;
+        BigDecimal totalPrice = computeTotalPrice(room.getPrice(), request.getPreStartDate(), request.getPreEndDate());
+        BigDecimal payPrice;
         BuyTypeEnum buyTypeEnum = BuyTypeEnum.getEnumByCode(request.getBuyType());
         switch (buyTypeEnum) {
             case TIME://小时模式
-                totalPrice = computeTotalPrice(room.getPrice(), request.getPreStartDate(), request.getPreEndDate());
+                payPrice = totalPrice;
                 break;
             case PACK://套餐模式
-                totalPrice = computeTotalPrice(request.getPackId());
+                payPrice = computeTotalPrice(request.getPackId());
                 break;
             default:
                 throw new BaseException("购买方式类型异常！");
@@ -798,7 +799,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         // 计算优惠券金额
         if (ObjectUtil.isNull(request.getCouponId()) || request.getCouponId() <= 0) {
             priceResponse.setCouponFee(BigDecimal.ZERO);
-            priceResponse.setPayFee(totalPrice);
+            priceResponse.setPayFee(payPrice);
         } else {
             // 判断优惠券是否可以使用
             SConsumerCoupon consumerCoupon = consumerCouponService.getById(request.getCouponId());