From d47bf3e1e3bf56b60ea6a1649ddd618d5ae803f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 十二月 2025 09:13:14 +0800
Subject: [PATCH] bug修改
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 98 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 42 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 437d8c6..84ffa90 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
@@ -90,7 +90,14 @@
private ISiteService siteService;
-
+// public static void main(String[] args) {
+// String now = DateUtil.now().substring(11, 19);
+// System.err.println(now);
+// if ("17:00:00".compareTo(now) <= 0 && "19:00:00".compareTo(now) >= 0) {
+// System.err.println("yes");
+// }
+//
+// }
/**
* 获取场地列表
@@ -104,10 +111,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(querySiteList.getTargetAudience()!=null,TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
+ .eq(querySiteList.getTargetAudience() != null, TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
.list()
.stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
+ // 获取当前时间 只需要时分秒 格式hh:mm:ss
+ String now = DateUtil.now().substring(11, 19);
for (QuerySiteListVo querySiteListVo : querySiteListVos) {
querySiteListVo.setPrice(0.0);
querySiteListVo.setTimes("");
@@ -116,16 +125,19 @@
continue;
}
List<TSitePrice> tSitePrices = priceMap.get(querySiteListVo.getId());
- if (tSitePrices!=null&& !tSitePrices.isEmpty()){
- BigDecimal bigDecimal = tSitePrices.get(0).getCashPrice();
+ if (tSitePrices != null && !tSitePrices.isEmpty()) {
+ BigDecimal bigDecimal = BigDecimal.ZERO;
// 遍历 查询最小的价格
for (TSitePrice tSitePrice : tSitePrices) {
- if (bigDecimal.compareTo(tSitePrice.getCashPrice()) > 0) {
- bigDecimal = tSitePrice.getCashPrice();
+ // 当前时间再范围之内
+ if (tSitePrice.getStartTime().compareTo(now) <= 0 && tSitePrice.getEndTime().compareTo(now) >= 0) {
+ if (tSitePrice.getCashPrice().compareTo(bigDecimal) > 0) {
+ bigDecimal = tSitePrice.getCashPrice();
+ }
}
}
querySiteListVo.setPrice(bigDecimal.doubleValue());
- querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size()-1).getEndTime());
+ querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size() - 1).getEndTime());
}
Map<String, Double> distance = GeodesyUtil.getDistance(querySiteList.getLon() + "," + querySiteList.getLat(), querySiteListVo.getStoreLon() + "," + querySiteListVo.getStoreLat());
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
@@ -316,42 +328,42 @@
count++;
}
}
- if (querySiteTimes.getSelectable() == 1&&end.before(now)){
+ if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
querySiteTimes.setSelectable(0);
}
- if (end.before(now)){
+ if (end.before(now)) {
querySiteTimes.setSelectable(0);
}
querySiteTimes.setSelectCount(count);
- if (flag == 0 && querySiteTimes.getSelectable() == 1) {
+ 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){
+ if (targetAudience == 1 && walkinCapacity != 0) {
// 不可预约
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else if (targetAudience==2){
+ } else if (targetAudience == 2) {
// 不能散客
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else{
+ } else {
querySiteTimes.setSelectable(1);
}
- }else{
- if (targetAudience==2){
+ } 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))) {
+ if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
querySiteTimes.setSelectable(1);
- }else{
+ } else {
querySiteTimes.setSelectable(0);
}
}
@@ -554,42 +566,42 @@
count++;
}
}
- if (querySiteTimes.getSelectable() == 1&&end.before(now)){
+ if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
querySiteTimes.setSelectable(0);
}
- if (end.before(now)){
+ if (end.before(now)) {
querySiteTimes.setSelectable(0);
}
querySiteTimes.setSelectCount(count);
- if (flag == 0 && querySiteTimes.getSelectable() == 1) {
+ 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){
+ if (targetAudience == 1 && walkinCapacity != 0) {
// 不可预约
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else if (targetAudience==2){
+ } else if (targetAudience == 2) {
// 不能散客
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else{
+ } else {
querySiteTimes.setSelectable(1);
}
- }else{
- if (targetAudience==2){
+ } 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))) {
+ if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
querySiteTimes.setSelectable(1);
- }else{
+ } else {
querySiteTimes.setSelectable(0);
}
}
@@ -685,12 +697,14 @@
}
+
/**
* 判断两个时间段是否有交集
+ *
* @param start1 第一个时间段开始时间
- * @param end1 第一个时间段结束时间
+ * @param end1 第一个时间段结束时间
* @param start2 第二个时间段开始时间
- * @param end2 第二个时间段结束时间
+ * @param end2 第二个时间段结束时间
* @return 如果有交集返回true，否则返回false
*/
private boolean isTimePeriodsIntersect(String start1, String end1, String start2, String end2) {
@@ -788,7 +802,7 @@
}
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin+querySiteTime.getCoinPrice();
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -861,9 +875,9 @@
siteBooking.setBooker(reservationSite.getBooker());
siteBooking.setPhone(reservationSite.getPhone());
siteBooking.setPayType(reservationSite.getPayType());
- if (reservationSite.getPayType()==3){
+ if (reservationSite.getPayType() == 3) {
siteBooking.setPayMoney(playCoin.doubleValue());
- }else{
+ } else {
siteBooking.setPayMoney(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
}
siteBooking.setUserCouponId(reservationSite.getCouponId());
@@ -871,7 +885,7 @@
siteBooking.setState(1);
siteBooking.setTargetAudience(reservationSite.getTargetAudience());
siteBooking.setInsertTime(new Date());
- siteBooking.setMoney(money+","+playCoin);
+ siteBooking.setMoney(money + "," + playCoin);
siteBooking.setNextName(reservationSite.getNextName());
siteBooking.setIsHalf(reservationSite.getIsHalf());
siteBooking.setHalfName(reservationSite.getHalfName());
@@ -1096,7 +1110,7 @@
pageNo = (pageNo - 1) * pageSize;
List<QueryMySiteVo> queryMySiteVos = this.baseMapper.queryMySite(uid, status, pageNo, pageSize);
for (QueryMySiteVo queryMySiteVo : queryMySiteVos) {
- if (queryMySiteVo.getTargetAudience()==null){
+ if (queryMySiteVo.getTargetAudience() == null) {
queryMySiteVo.setTargetAudience(1);
}
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
@@ -1127,7 +1141,7 @@
// }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin+querySiteTime.getCoinPrice();
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -1154,9 +1168,9 @@
if (siteBooking.getTargetAudience() == 1 && format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
return ResultUtil.error("预约当天，不能取消");
}
- if (siteBooking.getTargetAudience() == 2){
+ if (siteBooking.getTargetAudience() == 2) {
Date date = new Date();
- if (siteBooking.getEndTime().before( date)){
+ if (siteBooking.getEndTime().before(date)) {
return ResultUtil.error("已过期，不能取消");
}
}
@@ -1291,7 +1305,7 @@
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin+querySiteTime.getCoinPrice();
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -1327,9 +1341,9 @@
siteBooking.setOrderNo(sdf.format(new Date()) + UUIDUtil.getNumberRandom(3));
siteBooking.setPayType(payType);
- if (payType==3){
+ if (payType == 3) {
siteBooking.setPayMoney(playCoin.doubleValue());
- }else{
+ } else {
siteBooking.setPayMoney(money.doubleValue());
}
if (payType == 3) {
@@ -1379,7 +1393,7 @@
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin+querySiteTime.getCoinPrice();
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -1403,7 +1417,7 @@
money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
}
}
- switch (siteBooking.getPayType()){
+ switch (siteBooking.getPayType()) {
case 1:
map.put("cash", money.doubleValue());
break;
--
Gitblit v1.7.1