From 02fb8cddb6c0ec60b6ba6d08beb673214d9b6959 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 25 九月 2023 17:26:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 e2eb379..5bcce9e 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
@@ -113,7 +113,10 @@
querySiteInfoVo.setImgs(site.getImgs());
querySiteInfoVo.setDistance(0D);
querySiteInfoVo.setCashPriceOne(site.getCashPriceOne());
- querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne());
+ if(site.getPlayPaiCoinOne()!=null){
+ querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne().intValue());
+ }
+
querySiteInfoVo.setIntroduce(site.getIntroduce());
ArrayList<String> nextName = new ArrayList<>();
ArrayList<String> halfName = new ArrayList<>();
@@ -158,19 +161,29 @@
e.setTime(sdf.parse(day + " " + site.getAppointmentEndTime()));
int hour = e.get(Calendar.HOUR_OF_DAY);
+
int minute = e.get(Calendar.MINUTE);
+
List<QuerySiteTimes> list = new ArrayList<>();
+
SimpleDateFormat sdfs = new SimpleDateFormat("HH:mm");
+
while (true){
+
String start = sdfs.format(s.getTime());
s.set(Calendar.MINUTE, s.get(Calendar.MINUTE) + 30);
+
int e_hour = s.get(Calendar.HOUR_OF_DAY);
+
int e_minute = s.get(Calendar.MINUTE);
+
String end = sdfs.format(s.getTime());
QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+
querySiteTimes.setTime(start + "-" + end);
+
querySiteTimes.setSelectable(1);
SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("state", 1)
--
Gitblit v1.7.1