From 8c55ab2701c99cec16eff92a26fefdf77fcdd28f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:44 +0800
Subject: [PATCH] app接口修改
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 e1de1aa..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
@@ -112,12 +112,17 @@
querySiteInfoVo.setStorePhone(store.getPhone());
querySiteInfoVo.setImgs(site.getImgs());
querySiteInfoVo.setDistance(0D);
+ querySiteInfoVo.setCashPriceOne(site.getCashPriceOne());
+ if(site.getPlayPaiCoinOne()!=null){
+ querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne().intValue());
+ }
+
querySiteInfoVo.setIntroduce(site.getIntroduce());
ArrayList<String> nextName = new ArrayList<>();
ArrayList<String> halfName = new ArrayList<>();
String nextName1 = site.getNextName();
String halfName1 = site.getHalfName();
-
+ querySiteInfoVo.setIshalf(site.getIshalf());
String[] split = nextName1.split(",");
for (String s : split) {
nextName.add(s);
@@ -156,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)
@@ -467,7 +482,10 @@
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
Site site = this.getById(siteBooking.getSiteId());
String[] split = siteBooking.getTimes().split(";");
- queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ if(site!=null){
+
+ queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ }
}
return queryMySiteVos;
}
--
Gitblit v1.7.1