From d36bf25f7494870cbb77c256a04dd8c8b2d42f31 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 28 十一月 2023 11:38:25 +0800
Subject: [PATCH] 11.11
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 538 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 414 insertions(+), 124 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 6c7ba02..b72b9d6 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
@@ -1,64 +1,50 @@
package com.dsh.guns.modular.system.controller.system;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.dto.JsDto;
import com.dsh.course.dto.StudentQeryDto;
+import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.CoachClient;
-import com.dsh.course.feignClient.account.model.CityManager;
import com.dsh.course.feignClient.account.model.Coach;
+import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.course.CoursePackageClient;
import com.dsh.course.feignClient.course.CoursePackageDiscountClient;
import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient;
import com.dsh.course.feignClient.course.CoursePackageTypeClient;
-import com.dsh.course.feignClient.course.model.TCoursePackageType;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.service.TGameConfigService;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.guns.modular.system.controller.util.MD5;
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;
-import com.google.common.base.Ascii;
-import com.google.gson.JsonObject;
-import com.netflix.ribbon.proxy.annotation.Http;
-import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
-import io.netty.util.AsciiString;
-import io.rong.util.HttpUtil;
-import io.swagger.models.auth.In;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.logging.log4j.util.Base64Util;
+
+import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+
import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
@Controller
@RequestMapping("/ball")
@@ -95,6 +81,9 @@
@Resource
private CoursePackageClient coursePackageClient;
+ @Autowired
+ private AppUserClient appUserClient;
+
@RequestMapping("/tolist")
public String tolist(Model model) {
@@ -174,6 +163,28 @@
return new ResultUtil<>(0,0,"到店成功",null,null);
}
+ @RequestMapping("/confirm/{id}")
+ @ResponseBody
+ public ResultUtil confirm(@PathVariable("id") Integer id) {
+
+ SiteBooking byId = iSiteBookingService.getById(id);
+ String money = byId.getMoney();
+ // todo 这里手动支付 默认按照现金当作支付金额 后续可能要问下产品
+ String[] split = money.split(",");
+ Double aDouble = Double.valueOf(split[0]);
+ System.out.println("============"+id);
+ SiteBooking siteBooking = new SiteBooking();
+ siteBooking.setPayMoney(aDouble);
+ siteBooking.setId(id);
+ siteBooking.setStatus(1);
+ siteBooking.setPayType(4);
+ siteBooking.setPayUserId(UserExt.getUser().getId());
+ iSiteBookingService.updateById(siteBooking);
+
+ return new ResultUtil<>(0,0,"手动支付成功",null,null);
+ }
+
+
/**
* 获取变更列表
*/
@@ -184,9 +195,23 @@
@ResponseBody
public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
-
+ User user = UserExt.getUser();
+ ballQueryDto.setType(user.getObjectType());
+ ballQueryDto.setId(user.getObjectId());
return ballClient.list(ballQueryDto);
}
+
+ @ResponseBody
+ @PostMapping("/editCoursePackageState")
+ public ResultUtil editCoursePackageState(Integer id, Integer state){
+ Game game = new Game();
+ game.setId(id);
+ game.setState(state);
+ ballClient.save(game);
+
+ return ResultUtil.success();
+ }
+
@RequestMapping("/save")
@ResponseBody
@@ -201,18 +226,32 @@
, String zs, BigDecimal zsCoin, BigDecimal zsCash, String zsImage, BigDecimal zsInt, Integer zsId,Integer zsIId
, String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId
, String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId
-
-
-
-
+ ,String sutuName
) {
Game game = new Game();
game.setRed(red);
+ game.setState(0);
game.setBlue(blue);
+
+
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+
+
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ System.out.println("=====byId======="+byId);
+ game.setProvinceCode(byId.getProvinceCode());
+ game.setCityCode(byId.getCityCode());
+
+
+ }else {
game.setProvinceCode(province);
game.setCityCode(city);
+
+ }
game.setSiteId(site);
game.setStoreId(store);
game.setId(id);
@@ -224,8 +263,27 @@
game.setOperationId(0);
}
System.out.println("============"+game);
- Integer gameId = ballClient.save(game);
+ // 添加sutu编号
+ HashMap<String, String> map3 = new HashMap<>();
+ // 添加sutu编号
+ // 添加门禁 红蓝方
+ TSite si = siteService.getById(site);
+ TStore st = storeService.getById(store);
+ map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map3.put("space_id", si.getId() + "");
+ map3.put("name", sutuName);
+ map3.put("city_code", "");
+ String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map3);
+ System.out.println("---------------------------"+s3);
+ JSONObject jsonObject = new JSONObject(s3);
+ // 获取 data 字段的值
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+ // 获取 sutu_id 字段的值
+ String sutuIdValue = dataObject.getString("sutu_id");
+ Integer sutuId = Integer.valueOf(sutuIdValue);
+ game.setSutuId(sutuId);
+ Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
@@ -357,10 +415,25 @@
gameConfigly.setIntegral(lyInt);
gameConfigly.setOtherId(gameId);
gameConfigList.add(gameConfigly);
+ HashMap<String, String> map1 = new HashMap<>();
+ HashMap<String, String> map2 = new HashMap<>();
+
+
+ map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id", si.getId() + "");
+ map1.put("device_id", red);
+ map1.put("region_id", st.getId() + "");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ map2.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map2.put("space_id", si.getId() + "");
+ map2.put("device_id", blue);
+ map2.put("region_id", st.getId() + "");
+ // 添加门禁
+ String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map2);
-System.out.println("---------------------------"+gameConfigList);
ballClient.saveConfig( gameConfigList);
return null;
}
@@ -368,7 +441,32 @@
@RequestMapping("/pre_add")
public String add(Model model) {
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+
+ model.addAttribute("is3","true");
+ model.addAttribute("storeId",UserExt.getUser().getObjectId());
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ System.out.println("=====byId======="+byId);
+ model.addAttribute("cityCode",byId.getCityCode());
+ model.addAttribute("provinceCode",byId.getProvinceCode());
+ model.addAttribute("oId",byId.getOperatorId());
+ return PREFIX+"ball_pre_add1.html";
+
+ }
+
+ if (objectType == 2){
+ model.addAttribute("is3","true");
+ model.addAttribute("oId",UserExt.getUser().getObjectId());
+ return PREFIX+"ball_pre_add2.html";
+ }
+
+
+
model.addAttribute("is","${is}");
+
+
return PREFIX+"ball_pre_add.html";
}
@@ -379,11 +477,84 @@
private TGameConfigService gameConfigService;
@RequestMapping("/pre_edit/{id}")
public String pre_edit(@PathVariable("id") Integer id,Model model) {
+ Game game = ballClient.queryGame(id);
+ System.out.println("---------game------"+game);
+ model.addAttribute("game",game);
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
+
+ TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
+ model.addAttribute("kc",kc);
+
+
+ TGameConfig sq = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 16));
+ model.addAttribute("sq",sq);
+
+
+ TGameConfig sm = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 13));
+ model.addAttribute("sm",sm);
+
+ TGameConfig sd = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 15));
+ model.addAttribute("sd",sd);
+
+ TGameConfig fk = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 1));
+ model.addAttribute("fk",fk);
+
+ TGameConfig jx = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 7));
+ model.addAttribute("jx",jx);
+
+ TGameConfig qw = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 8));
+ model.addAttribute("qw",qw);
+
+ TGameConfig zs = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 10));
+ model.addAttribute("zs",zs);
+
+ TGameConfig zs2 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 11));
+ model.addAttribute("zs2",zs2);
+
+ TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
+ model.addAttribute("ly",ly);
+
+
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+ model.addAttribute("is3","true");
+ model.addAttribute("storeId",UserExt.getUser().getObjectId());
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ model.addAttribute("cityCode",byId.getCityCode());
+ model.addAttribute("provinceCode",byId.getProvinceCode());
+ model.addAttribute("oId",byId.getOperatorId());
+ return PREFIX+"ball_pre_edit1.html";
+
+ }
+ if (objectType == 2){
+ return PREFIX+"ball_pre_edit2.html";
+
+ }
+
+ return PREFIX+"ball_pre_edit.html";
+ }
+
+
+ @RequestMapping("/pre_info/{id}")
+ public String pre_info(@PathVariable("id") Integer id,Model model) {
Game game = ballClient.queryGame(id);
- System.out.println("---------game------"+game);
+ System.out.println("---------game------"+game);
model.addAttribute("game",game);
+
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
model.addAttribute("kc",kc);
@@ -419,7 +590,7 @@
- return PREFIX+"ball_pre_edit.html";
+ return PREFIX+"ball_pre_info.html";
}
@Autowired
@@ -463,8 +634,6 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
-
Site site = siteClient.listById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
@@ -476,7 +645,12 @@
System.out.println("是否超过当前日期"+isAfterCurrentDate);
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
- String nextTime = getNextTime(currentTime);
+ String nextTime = null;
+ if("智慧场地".equals(site.getTypeName())){
+ nextTime=getNextTimeOne(currentTime);
+ }else {
+ nextTime= getNextTime(currentTime);
+ }
String timeRange = currentTime + "-" + nextTime;
@@ -504,9 +678,6 @@
orderDto.setState(1);
}
-
-
-
timeRanges.add(orderDto);
currentTime = nextTime;
}
@@ -524,10 +695,7 @@
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
+
List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
Object code = list.get(0).get("code");
@@ -535,11 +703,24 @@
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));
+ if(UserExt.getUser().getObjectType()==3){
+ list2=storeService.list(new QueryWrapper<TStore>().eq("id", UserExt.getUser().getObjectId()).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);
-
+ model.addAttribute("objType", UserExt.getUser().getObjectType());
+ // 查询运营商下所有门店 所有场地
+ 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("objectType", objectType);
return PREFIX+"yuyue_edit.html";
}
@@ -573,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);
//时间段
@@ -643,35 +843,13 @@
}
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;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
- 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);
-
-
+ 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";
}
@@ -697,10 +875,20 @@
studentQeryDto.setStart(split[0]);
studentQeryDto.setEnd(split[1]);
}
-
-
-
-
+ // 如果当前登陆人是运营商 只查询该运营商下的课包的数据
+ if(UserExt.getUser().getObjectType() == 2){
+ // 先查询这个运营商下的所有门店ids
+ List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ // 根据门店ids 查询所有课包ids
+ List<TCoursePackage> tCoursePackages = new ArrayList<>();
+ for (Integer storeId : storeIds) {
+ List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
+ tCoursePackages.addAll(coursePackageByStoreId);
+ }
+ List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
+ studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
+ }
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
System.out.println("=========getStudentTotal======="+pays);
@@ -719,14 +907,13 @@
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()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ pacQueryDto.setStoreIds(storeIds);
+ }
List<Map<String, Object>> pays = coursePackageClient.bypac(pacQueryDto);
-
System.out.println("=========getStudentTotal======="+pays);
-
return pays;
}
@@ -760,18 +947,47 @@
@RequestMapping("/yuyuelist")
@ResponseBody
public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if(objectType==2){
+ List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ bookingQuery.setStoreIds(operatorId);
+ }
+ if(objectType==3){
+ bookingQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
List<Map<String,Object>> orders = ballClient.listorder(bookingQuery);
System.out.println("=======ballQueryDto=========="+bookingQuery);
+ for (Map<String, Object> vo : orders) {
+
+ if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 1){
+ vo.put("payType","微信");
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 2){
+ vo.put("payType","支付宝");
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 3){
+ vo.put("payType","玩湃币");
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 4){
+ if (vo.get("payUserId")!=null){
+ User payUserId = userService.getById(Integer.parseInt(vo.get("payUserId").toString()));
+ if(payUserId!=null){
+ vo.put("payType","手动支付"+"-"+payUserId.getName());
+ }
+ }
+ }
+ }
return orders;
}
@RequestMapping("/addjs")
@ResponseBody
- public void addjs( @RequestBody JsDto jsDto) {
+ public ResultUtil addjs( @RequestBody JsDto jsDto) {
System.out.println("=======jsDto========"+jsDto);
storeService.insert(jsDto);
+ return new ResultUtil(0,0,"保存成功",null,null);
}
@@ -806,15 +1022,18 @@
private SiteClient siteClient;
+
+
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date) {
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,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));
+ 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(";");
@@ -827,9 +1046,7 @@
}
System.out.println("======strings======="+strings);
-
List<OrderDto> timeRanges = new ArrayList<>();
-
Site site = siteClient.listById(id);
System.out.println("================"+site);
@@ -838,8 +1055,12 @@
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
- String nextTime = getNextTime(currentTime);
-
+ String nextTime = null;
+ if("智慧场地".equals(site.getTypeName())){
+ nextTime=getNextTimeOne(currentTime);
+ }else {
+ nextTime= getNextTime(currentTime);
+ }
String timeRange = currentTime + "-" + nextTime;
OrderDto orderDto = new OrderDto();
@@ -863,6 +1084,10 @@
System.out.println("-------------"+timeRanges);
return timeRanges;
+
+
+
+
}
@@ -880,26 +1105,30 @@
return String.format("%02d:%02d", hour, minute);
-// String[] parts = currentTime.split(":");
-// int hour = Integer.parseInt(parts[0]);
-// int minute = Integer.parseInt(parts[1]);
-//
-// if (minute == 45) {
-// hour++;
-// minute = 0;
-// } else if (minute == 0){
-// minute = 15;
-// }else if (minute == 15){
-// minute = 30;
-// }else if (minute == 30){
-// minute = 45;
-// }
-//
-// return String.format("%02d:%02d", hour, minute);
-
}
+
+ public static String getNextTimeOne(String currentTime) {
+
+ String[] parts = currentTime.split(":");
+ int hour = Integer.parseInt(parts[0]);
+ int minute = Integer.parseInt(parts[1]);
+
+ if (minute == 45) {
+ hour++;
+ minute = 0;
+ } else if (minute == 0){
+ minute = 15;
+ }else if (minute == 15){
+ minute = 30;
+ }else if (minute == 30){
+ minute = 45;
+ }
+
+ return String.format("%02d:%02d", hour, minute);
+
+ }
@RequestMapping("/halfName/{id}")
@@ -916,23 +1145,44 @@
public String yuyueadd(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
-
String cityCode = null;
if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ // 获取到这个运营商下面的所有门店
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId",objectId));
+ model.addAttribute("store", operatorId);
+ List<Coach> coach = coachClient.queryCoachByOperatorId(objectId);
+ model.addAttribute("coach", coach);
+ // 如果该运营商下面没有门店
+ if (operatorId.size()==0){
+ List<TStore> o = new ArrayList<>();
+ List<TSite> tSites = new ArrayList<>();
+ model.addAttribute("store", o);
+ model.addAttribute("site", tSites);
+ }else{
+ List<TSite> storeId = siteService.list(new QueryWrapper<TSite>()
+ .eq("storeId", operatorId.get(0).getId()));
+ model.addAttribute("site", storeId);
+ }
+ }else {
+ 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 =new ArrayList<>();
+ if(objectType==3){
+ list2 = storeService.list(new QueryWrapper<TStore>().eq("id", objectId).eq("state", 1));
+ }else {
+ 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);
}
- 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);
+ model.addAttribute("objectType",objectType);
return PREFIX+"yuyue_add.html";
}
@@ -944,10 +1194,50 @@
siteBooking.setInsertTime(new Date());
siteBooking.setState(1);
siteBooking.setStatus(0);
+ siteBooking.setAddType(1);
+ // 查询当前预约人是否是会员
+ String phone = siteBooking.getPhone();
+ String booker = siteBooking.getBooker();
+ TAppUser appUserByPhone = appUserClient.getAppUserByPhone(phone);
+ TStore byId1 = storeService.getById(siteBooking.getStoreId());
+ if (appUserByPhone== null){
+ // 则当前预约人不是会员 添加到会员表里
+ TAppUser tAppUser = new TAppUser();
+ tAppUser.setName(booker);
+ tAppUser.setPhone(phone);
+ tAppUser.setProvince(byId1.getProvince());
+ tAppUser.setProvinceCode(byId1.getProvinceCode());
+ tAppUser.setCity(byId1.getCity());
+ tAppUser.setCityCode(byId1.getCityCode());
+ tAppUser.setIsVip(0);
+ tAppUser.setInsertType(UserExt.getUser().getObjectType());
+ tAppUser.setAddUserId(UserExt.getUser().getObjectId());
+ tAppUser.setInsertTime(new Date());
+ tAppUser.setPassword(MD5.md5("111111"));
+ appUserClient.addAppUser1(tAppUser);
+ TAppUser appUserByPhone1 = appUserClient.getAppUserByPhone(phone);
+ siteBooking.setAppUserId(appUserByPhone1.getId());
+ }else{
+ siteBooking.setAppUserId(appUserByPhone.getId());
+ }
+ // 如果是运营商添加的话 根据门店的省市来存储
+ if (UserExt.getUser().getObjectType() == 2){
+ TStore byId = storeService.getById(siteBooking.getStoreId());
+ siteBooking.setProvince(byId.getProvince());
+ siteBooking.setProvinceCode(byId.getProvinceCode());
+ siteBooking.setCity(byId.getCity());
+ siteBooking.setCityCode(byId.getCityCode());
+ }
+ if (UserExt.getUser().getObjectType() == 3){
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ siteBooking.setProvince(byId.getProvince());
+ siteBooking.setProvinceCode(byId.getProvinceCode());
+ siteBooking.setCity(byId.getCity());
+ siteBooking.setCityCode(byId.getCityCode());
+ }
- siteClient.addSiteBooking(siteBooking);
+ siteClient.addSiteBooking(siteBooking);
System.out.println("================="+siteBooking);
-
return new ResultUtil<>(null,200,null,null,null);
}
--
Gitblit v1.7.1