From 32106f511657695e79d53e98a350ce70a36f6da1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:07:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 11 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 f2ee93a..0789e41 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
@@ -22,6 +22,7 @@
import com.dsh.course.service.TGameConfigService;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.*;
@@ -40,6 +41,8 @@
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
@@ -869,7 +872,6 @@
@RequestMapping("/getStudentTotal")
@ResponseBody
public List<Map<String, Object>>getStudentTotal(@RequestBody StudentQeryDto studentQeryDto) {
-System.out.println("========ballQueryDto======"+studentQeryDto);
if (studentQeryDto.getTimes()!=null&& studentQeryDto.getTimes()!=""){
String[] split = studentQeryDto.getTimes().split(",");
studentQeryDto.setStart(split[0]);
@@ -890,9 +892,6 @@
studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
}
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
-
- System.out.println("=========getStudentTotal======="+pays);
-
return pays;
}
@@ -901,19 +900,37 @@
@RequestMapping("/bypac")
@ResponseBody
public List<Map<String, Object>>bypac(@RequestBody PacQueryDto pacQueryDto) {
- System.out.println("========ballQueryDto======"+pacQueryDto);
if (pacQueryDto.getTimes()!=null&& pacQueryDto.getTimes()!=""){
String[] split = pacQueryDto.getTimes().split(",");
pacQueryDto.setStart(split[0]);
pacQueryDto.setEnd(split[1]);
}
if (UserExt.getUser().getObjectType() == 2){
- List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ QueryWrapper<TStore> queryWrapper = new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()).eq("state", 1);
+ if(ToolUtil.isNotEmpty(pacQueryDto.getCityCode())){
+ queryWrapper.eq("cityCode", pacQueryDto.getCityCode());
+ }
+ if(ToolUtil.isNotEmpty(pacQueryDto.getName())){
+ queryWrapper.like("name", pacQueryDto.getName());
+ }
+ List<Integer> storeIds = storeService.list(queryWrapper)
.stream().map(TStore::getId).collect(Collectors.toList());
+ storeIds.add(-1);
+ pacQueryDto.setStoreIds(storeIds);
+ }else{
+ QueryWrapper<TStore> queryWrapper = new QueryWrapper<TStore>().eq("state", 1);
+ if(ToolUtil.isNotEmpty(pacQueryDto.getCityCode())){
+ queryWrapper.eq("cityCode", pacQueryDto.getCityCode());
+ }
+ if(ToolUtil.isNotEmpty(pacQueryDto.getName())){
+ queryWrapper.like("name", pacQueryDto.getName());
+ }
+ List<Integer> storeIds = storeService.list(queryWrapper)
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ storeIds.add(-1);
pacQueryDto.setStoreIds(storeIds);
}
List<Map<String, Object>> pays = coursePackageClient.bypac(pacQueryDto);
- System.out.println("=========getStudentTotal======="+pays);
return pays;
}
@@ -977,6 +994,23 @@
}
}
}
+
+ if (Integer.parseInt(vo.get("status").toString())==1 ){
+ String dateTimeStr = vo.get("times").toString();
+ String formattedDateTimeStr = dateTimeStr.substring(0, 11) + dateTimeStr.substring(17);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ try {
+ Date date = sdf.parse(formattedDateTimeStr);
+ if (new Date().after(date)){
+ vo.put("status",4);
+ }
+
+ System.out.println(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
}
return orders;
}
@@ -1007,7 +1041,7 @@
System.out.println("=====stie====="+site);
System.out.println("=====type====="+type);
- if (type == 0 ){
+ if (type == 1 ){
doubles.add(site.getCashPrice());
doubles.add(Double.valueOf(site.getPlayPaiCoin()));
return doubles;
@@ -1029,7 +1063,7 @@
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) {
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) throws ParseException {
// System.out.println("=======date======"+date);
//
// List<String> strings = new ArrayList<>();
@@ -1089,7 +1123,8 @@
// return timeRanges;
-
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date now = new Date();
System.out.println("=======date======" + date);
List<String> strings = new ArrayList<>();
@@ -1168,6 +1203,10 @@
String stime = date + " " + currentTime;
String etime = date + " " + nextTime;
+ Date isPass = format.parse(etime);
+
+
+
orderDto.setState(1);
// 查出lock
List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
@@ -1184,7 +1223,9 @@
}
}
-
+ if (isPass.before(now)){
+ orderDto.setState(0);
+ }
}
@@ -1251,6 +1292,17 @@
return split;
}
+ @RequestMapping("/nextName/{id}")
+ @ResponseBody
+ public String[] nextName(@PathVariable("id") Integer id) {
+ TSite byId = siteService.getById(id);
+ String[] split = byId.getNextName().split(",");
+ System.out.println("=-============"+split);
+
+ return split;
+ }
+
+
@RequestMapping("/yuyue_add")
public String yuyueadd(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
@@ -1305,6 +1357,48 @@
siteBooking.setState(1);
siteBooking.setStatus(0);
siteBooking.setAddType(1);
+
+ //存开始和结束时间
+ String times = siteBooking.getTimes();
+ String[] dates = times.split(";");
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ Date minDate = null;
+ Date maxDate = null;
+
+ for (String dateStr : dates) {
+ String[] dateRange = dateStr.split("-");
+ String startDateStr = dateRange[0].trim();
+ String endDateStr = dateRange[1].trim();
+
+ try {
+ Date startDate = format.parse(startDateStr);
+ Date endDate = format.parse(endDateStr);
+
+ if (minDate == null || startDate.before(minDate)) {
+ minDate = startDate;
+ }
+ if (maxDate == null || endDate.after(maxDate)) {
+ maxDate = endDate;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ System.out.println("最小日期：" + minDate);
+ System.out.println("最大日期：" + maxDate);
+ siteBooking.setStartTime(minDate);
+ siteBooking.setEndTime(maxDate);
+ siteBooking.setPayType(2);
+
+ //存多少钱
+ String money = siteBooking.getMoney();
+ String[] moneys = money.split(",");
+ siteBooking.setPayMoney(Double.valueOf(moneys[0]));
+
+
// 查询当前预约人是否是会员
String phone = siteBooking.getPhone();
String booker = siteBooking.getBooker();
--
Gitblit v1.7.1