From aba8d209561a130b6d849d96ff202fe172b1ad92 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 11 十一月 2025 13:54:33 +0800
Subject: [PATCH] 玩湃本次新增迭代所有代码
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 309 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 268 insertions(+), 41 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index d21f19d..966f980 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -104,11 +104,12 @@
querySiteList.setPageNum((querySiteList.getPageNum() - 1) * querySiteList.getPageSize());
DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek();
Map<Integer, List<TSitePrice>> priceMap = sitePriceService.lambdaQuery().eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue())
- .eq(TSitePrice::getTargetAudience,1).list()
+ .list()
.stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
for (QuerySiteListVo querySiteListVo : querySiteListVos) {
querySiteListVo.setPrice(0.0);
+ querySiteListVo.setTimes("");
if (ToolUtil.isEmpty(querySiteList.getLon())) {
querySiteListVo.setDistance(0D);
continue;
@@ -282,7 +283,6 @@
querySiteTimes.setSelectCount(0);
querySiteTimes.setSelectMaxCount(site.getWalkinCapacity());
querySiteTimes.setIsReserve(0);
- querySiteTimes.setTimeAfter(0);
querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
String temp = tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
@@ -317,11 +317,247 @@
}
if (querySiteTimes.getSelectable() == 1&&end.before(now)){
querySiteTimes.setSelectable(0);
- querySiteTimes.setTimeAfter(1);
}
if (end.before(now)){
querySiteTimes.setSelectable(0);
- querySiteTimes.setTimeAfter(1);
+ }
+ querySiteTimes.setSelectCount(count);
+ if (flag == 0 && querySiteTimes.getSelectable() == 1) {
+ // 当前时间段还没有预约
+ Integer walkinCapacity = site.getWalkinCapacity();
+ // 计算散客预约人数和最大散客容纳数
+ System.err.println("预约人数" + count);
+ System.err.println("最大散客容纳数" + walkinCapacity);
+ if (walkinCapacity <= count) {
+ if (targetAudience==1 && walkinCapacity!=0){
+ // 不可预约
+ System.err.println("不可预约 也不能散客");
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(0);
+ }else if (targetAudience==2){
+ // 不能散客
+ System.err.println("不可预约 也不能散客");
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(0);
+ }else{
+ querySiteTimes.setSelectable(1);
+ }
+ }else{
+ if (targetAudience==2){
+ // 散客只能预约当前时间段
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String nowStr = simpleDateFormat.format(now);
+ // 判断当前时间有没有在timePriceStart和timePriceEnd之间
+ if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
+ querySiteTimes.setSelectable(1);
+ }else{
+ querySiteTimes.setSelectable(0);
+ }
+ }
+ }
+ }
+ // 查出lock
+ List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+ for (SiteLock siteLock : list) {
+ String stime = day + " " + tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3);
+ String etime = day + " " + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+ if (stringDateBetween) {
+ System.err.println("11111预约开始" + stime + "预约结束" + etime);
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+ System.err.println("22222预约开始" + stime + "预约结束" + etime);
+
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+ System.err.println("33333预约开始" + stime + "预约结束" + etime);
+
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ }
+ timeRanges.add(querySiteTimes);
+ }
+ System.out.println("封装后的基础时间段和价格" + site);
+
+// System.out.println("================" + site);
+// String appointmentStartTime = site.getAppointmentStartTime();
+// String appointmentEndTime = site.getAppointmentEndTime();
+//
+// String currentTime = appointmentStartTime;
+// while (currentTime.compareTo(appointmentEndTime) < 0) {
+// String nextTime = null;
+// if ("智慧场地".equals(site.getTypeName())) {
+// nextTime = getNextTimeOne(currentTime);
+// } else {
+// nextTime = getNextTime(currentTime);
+// }
+//
+//
+// String timeRange = currentTime + "-" + nextTime;
+// QuerySiteTimes orderDto = new QuerySiteTimes();
+// orderDto.setTime(timeRange);
+//
+// LocalTime currentTime1 = LocalTime.now();
+// LocalTime targetTime = LocalTime.parse(currentTime);
+//
+// boolean hasExceeded = currentTime1.isAfter(targetTime);
+//// if (hasExceeded){
+//// orderDto.setSelectable(0);
+//// }
+// if (strings.contains(timeRange)) {
+//
+// orderDto.setSelectable(0);
+// } else {
+//
+// String stime = day + " " + currentTime;
+// String etime = day + " " + nextTime;
+// orderDto.setSelectable(1);
+// // 查出lock
+// List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+// for (SiteLock siteLock : list) {
+// boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+// if (stringDateBetween) {
+// orderDto.setSelectable(0);
+// }
+// if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+// orderDto.setSelectable(0);
+// }
+// if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+// orderDto.setSelectable(0);
+// }
+//
+// }
+//
+//
+// }
+//
+//
+// timeRanges.add(orderDto);
+// currentTime = nextTime;
+// }
+ System.out.println("----最后封装的时间段数据------" + timeRanges);
+
+ return timeRanges;
+
+
+ }
+
+ // 用于继续支付
+ public List<QuerySiteTimes> querySiteTimes1(Integer siteBookingId, String day, String halfName, String siteName, Integer targetAudience) throws Exception {
+
+ SiteBooking siteBookingServiceById = iSiteBookingService.getById(siteBookingId);
+ Integer id = siteBookingServiceById.getSiteId();
+ System.out.println("=======date======" + day);
+ List<String> strings = new ArrayList<>();
+
+ List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
+ .ne("id", siteBookingId).eq("siteId", id).ne("status", 5).eq("nextName", siteName).like("times", day));
+
+ if (siteName == null || siteName.equals("")) {
+ siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).ne("status", 5).like("times", day));
+ }
+
+
+ System.out.println("=======已预约列表======" + siteBookings);
+ for (SiteBooking siteBooking : siteBookings) {
+
+
+ String[] split = siteBooking.getTimes().split(";");
+
+ if (siteBooking.getIsHalf() == 2) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+ } else {
+ if (halfName == null) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+ }
+
+ if (siteBooking.getHalfName().equals(halfName)) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+
+ }
+ }
+ }
+ System.out.println("======已经预约时间段=======" + strings);
+
+
+ Site site = siteService.getById(id);
+ List<QuerySiteTimes> timeRanges = new ArrayList<>();
+ day = day.split(";")[0].split(" ")[0];
+ LocalDate date = LocalDate.parse(day);
+ DayOfWeek dayOfWeek = date.getDayOfWeek();
+ // 通过日期 确定周X 查询设置的可以约时间段和金额 封装基础时间段数据
+ LambdaQueryWrapper<TSitePrice> tSitePriceLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getSiteId, id);
+ tSitePriceLambdaQueryWrapper.orderByAsc(TSitePrice::getStartTime);
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getTargetAudience, targetAudience);
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue());
+ if (StringUtils.hasLength(halfName)) {
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 2);
+ } else {
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 1);
+ }
+ List<TSitePrice> sitePrice = sitePriceService.list(tSitePriceLambdaQueryWrapper);
+
+ SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ for (TSitePrice tSitePrice : sitePrice) {
+ QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+ querySiteTimes.setTime(tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3));
+ querySiteTimes.setSelectable(1);
+ querySiteTimes.setSelectCount(0);
+ querySiteTimes.setSelectMaxCount(site.getWalkinCapacity());
+ querySiteTimes.setIsReserve(0);
+ querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
+ querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
+ String temp = tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ String timePriceStart = day + " " + tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3);
+ String timePriceEnd = day + " " + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ Date now = new Date();
+ Date start = simpleDateFormat1.parse(timePriceStart);
+ Date end = simpleDateFormat1.parse(timePriceEnd);
+ // 已经预约了 判断是散客模式还是订场模式
+ Integer flag = 0;
+ // 散客预约人数
+ Integer count = 0;
+ for (String time : strings) {
+ // 先判断时间是否和预约时间有交集
+ String s = time.split(",")[1];
+ String timeRange = time.split(",")[0];
+ String[] split = timeRange.split("-");
+ String bookingStart = day + " " + split[0];
+ String bookingEnd = day + " " + split[1];
+ if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
+ // 不相交
+ } else {
+ if (s.equals("1")) {
+ // 订场 不可再预约了
+ querySiteTimes.setIsReserve(1);
+ querySiteTimes.setSelectable(0);
+ flag = 1;
+ break;
+ }
+ count++;
+ }
+ }
+ if (querySiteTimes.getSelectable() == 1&&end.before(now)){
+ querySiteTimes.setSelectable(0);
+ }
+ if (end.before(now)){
+ querySiteTimes.setSelectable(0);
}
querySiteTimes.setSelectCount(count);
if (flag == 0 && querySiteTimes.getSelectable() == 1) {
@@ -528,7 +764,7 @@
String[] split = reservationSite.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
@@ -551,7 +787,7 @@
}
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin+querySiteTime.getCoinPrice();
break;
}
}
@@ -649,7 +885,7 @@
return aliPaymentSite(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
}
if (reservationSite.getPayType() == 3) {//玩湃币支付
- return playPaiCoinPaymentSite(appUser, playCoin.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
+ return playPaiCoinPaymentSite(appUser, playCoin.doubleValue(), siteBooking);
}
return ResultUtil.success();
@@ -859,11 +1095,14 @@
pageNo = (pageNo - 1) * pageSize;
List<QueryMySiteVo> queryMySiteVos = this.baseMapper.queryMySite(uid, status, pageNo, pageSize);
for (QueryMySiteVo queryMySiteVo : queryMySiteVos) {
+ if (queryMySiteVo.getTargetAudience()==null){
+ queryMySiteVo.setTargetAudience(1);
+ }
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
String[] split = siteBooking.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
@@ -887,12 +1126,12 @@
// }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin+querySiteTime.getCoinPrice();
break;
}
}
}
- queryMySiteVo.setPlayPaiCoin(playCoin.setScale(0, RoundingMode.DOWN).intValue());
+ queryMySiteVo.setPlayPaiCoin(playCoin);
}
return queryMySiteVos;
}
@@ -911,10 +1150,15 @@
Site byId = siteService.getById(siteBooking.getSiteId());
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
Date startTime = siteBooking.getStartTime();
- if (format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
+ if (siteBooking.getTargetAudience() == 1 && format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
return ResultUtil.error("预约当天，不能取消");
}
-
+ if (siteBooking.getTargetAudience() == 2){
+ Date date = new Date();
+ if (siteBooking.getEndTime().before( date)){
+ return ResultUtil.error("已过期，不能取消");
+ }
+ }
if (siteBooking.getStatus() == 0) {
siteBooking.setStatus(5);
siteBookingService.updateById(siteBooking);
@@ -1034,30 +1278,19 @@
String[] split = siteBooking.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
String bookingStart = day + " " + time.split("-")[0];
String bookingEnd = day + " " + time.split("-")[1];
- List<QuerySiteTimes> querySiteTimes = querySiteTimes(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
+ List<QuerySiteTimes> querySiteTimes = querySiteTimes1(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
String timePriceStart = day + " " + querySiteTime.getTime().split("-")[0];
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
- if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
- // 时间不相交
- } else if (querySiteTime.getSelectable() == 0) {
- if (querySiteTime.getIsReserve() == 1) {
- return ResultUtil.error("【" + s + "】" +
- "时间段已被使用");
- } else {
- return ResultUtil.error("【" + s + "】" +
- "时间段散客人数已满");
- }
- }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin+querySiteTime.getCoinPrice();
break;
}
}
@@ -1091,8 +1324,13 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
siteBooking.setOrderNo(sdf.format(new Date()) + UUIDUtil.getNumberRandom(3));
+
siteBooking.setPayType(payType);
- siteBooking.setPayMoney(money.doubleValue());
+ if (payType==3){
+ siteBooking.setPayMoney(playCoin.doubleValue());
+ }else{
+ siteBooking.setPayMoney(money.doubleValue());
+ }
if (payType == 3) {
siteBooking.setUserCouponId(null);
}
@@ -1128,30 +1366,19 @@
Map<String, Double> map = new HashMap<>();
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
String bookingStart = day + " " + time.split("-")[0];
String bookingEnd = day + " " + time.split("-")[1];
- List<QuerySiteTimes> querySiteTimes = querySiteTimes(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
+ List<QuerySiteTimes> querySiteTimes = querySiteTimes1(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
String timePriceStart = day + " " + querySiteTime.getTime().split("-")[0];
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
- if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
- // 时间不相交
- } else if (querySiteTime.getSelectable() == 0) {
- if (querySiteTime.getIsReserve() == 1) {
- return ResultUtil.error("【" + s + "】" +
- "时间段已被使用");
- } else {
- return ResultUtil.error("【" + s + "】" +
- "时间段散客人数已满");
- }
- }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin+querySiteTime.getCoinPrice();
break;
}
}
--
Gitblit v1.7.1