From 7c7ff243aa4d2830aac3223cf59775d43c372be1 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 27 十一月 2023 14:46:27 +0800
Subject: [PATCH] 11.27.2
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 179 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 86 insertions(+), 93 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 28814f3..32c31f1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -26,6 +26,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.DateComparisonExample;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -753,7 +754,26 @@
String convertedValue = s.substring(11);
strings1.add(convertedValue);
}
-
+ switch (book.getStatus()){
+ case 0:
+ model.addAttribute("state","待支付");
+ break;
+ case 1:
+ model.addAttribute("state","待核销");
+ break;
+ case 2:
+ model.addAttribute("state","已到店");
+ break;
+ case 3:
+ model.addAttribute("state","已完成");
+ break;
+ case 4:
+ model.addAttribute("state","已过期");
+ break;
+ case 5:
+ model.addAttribute("state","已取消");
+ break;
+ }
System.out.println("========strings1====="+strings1);
//时间段
@@ -823,43 +843,12 @@
}
System.out.println("-------------"+timeRanges);
model.addAttribute("timeRanges",timeRanges);
-
System.out.println("======timeRanges========"+timeRanges);
-
-
-
-
-
-
Integer objectType = UserExt.getUser().getObjectType();
- Integer objectId = UserExt.getUser().getObjectId();
-
- String cityCode = null;
-
-
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
- model.addAttribute("province", list);
-
- Object code = list.get(0).get("code");
- List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
-
- model.addAttribute("city", list1);
- String code1 = list1.get(0).get("code").toString();
-
- List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
- model.addAttribute("store", list2);
- TStore store = list2.get(0);
- List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
- model.addAttribute("site", list3);
- // 查询运营商下所有门店 所有场地
- if (objectType == 2){
- List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
- model.addAttribute("store", stores);
- // 门店ids
- List<Integer> storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList());
- List<TSite> sites = siteService.list(new QueryWrapper<TSite>().in("storeId", storeIds));
- model.addAttribute("site", sites);
- }
+ model.addAttribute("province", book.getProvince());
+ model.addAttribute("city", book.getCity());
+ model.addAttribute("store",storeService.getById(book.getStoreId()).getName());
+ model.addAttribute("siteName",siteService.getById(book.getSiteId()).getName());
model.addAttribute("objectType", objectType);
return PREFIX+"yuyue_info.html";
}
@@ -1033,69 +1022,72 @@
private SiteClient siteClient;
+
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date) {
- System.out.println("=======date======"+date);
-
- List<String> strings = new ArrayList<>();
-
-// List<SiteBooking> siteBookings = siteClient.listBooks(id);
- List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",date));
-System.out.println("=======siteBookings======"+siteBookings);
- for (SiteBooking siteBooking : siteBookings) {
- String[] split = siteBooking.getTimes().split(";");
- for (String s : split) {
-
- String convertedValue = s.substring(11);
- strings.add(convertedValue);
- }
-
- }
- System.out.println("======strings======="+strings);
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String day,String siteName,String halfName) {
+// System.out.println("=======date======"+date);
+//
+// List<String> strings = new ArrayList<>();
+//
+//// List<SiteBooking> siteBookings = siteClient.listBooks(id);
+// List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
+// .eq("siteId", id).like("times",date));
+//System.out.println("=======siteBookings======"+siteBookings);
+// for (SiteBooking siteBooking : siteBookings) {
+// String[] split = siteBooking.getTimes().split(";");
+// for (String s : split) {
+//
+// String convertedValue = s.substring(11);
+// strings.add(convertedValue);
+// }
+//
+// }
+// System.out.println("======strings======="+strings);
+//
+// List<OrderDto> timeRanges = new ArrayList<>();
+//
+// Site site = siteClient.listById(id);
+//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;
+// OrderDto orderDto = new OrderDto();
+// orderDto.setTime(timeRange);
+//
+// LocalTime currentTime1 = LocalTime.now();
+// LocalTime targetTime = LocalTime.parse(currentTime);
+//
+// boolean hasExceeded = currentTime1.isAfter(targetTime);
+// if (hasExceeded){
+// orderDto.setState(0);
+// }
+// if (strings.contains(timeRange)){
+// orderDto.setState(0);
+// }
+//
+//
+// timeRanges.add(orderDto);
+// currentTime = nextTime;
+// }
+// System.out.println("-------------"+timeRanges);
+//
+// return timeRanges;
- List<OrderDto> timeRanges = new ArrayList<>();
- Site site = siteClient.listById(id);
-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 nextTime = getNextTime(currentTime);
-
-
- String timeRange = currentTime + "-" + nextTime;
- OrderDto orderDto = new OrderDto();
- orderDto.setTime(timeRange);
-
- LocalTime currentTime1 = LocalTime.now();
- LocalTime targetTime = LocalTime.parse(currentTime);
-
- boolean hasExceeded = currentTime1.isAfter(targetTime);
- if (hasExceeded){
- orderDto.setState(0);
- }
- if (strings.contains(timeRange)){
- orderDto.setState(0);
- }
-
-
- timeRanges.add(orderDto);
- currentTime = nextTime;
- }
- System.out.println("-------------"+timeRanges);
-
- return timeRanges;
+return null;
}
@@ -1202,6 +1194,7 @@
siteBooking.setInsertTime(new Date());
siteBooking.setState(1);
siteBooking.setStatus(0);
+ siteBooking.setAddType(1);
// 查询当前预约人是否是会员
String phone = siteBooking.getPhone();
String booker = siteBooking.getBooker();
--
Gitblit v1.7.1