java/PlayPai.git

			@@ -109,7 +109,6 @@

			@RequestMapping("/tolist")
			public String tolist(Model model) {

			List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
			model.addAttribute("list",list);
			String roleid = UserExt.getUser().getRoleid();
			@@ -216,7 +215,7 @@
			@RequestMapping("/list")
			@ResponseBody
			public List<Game> changelist(BallQueryDto ballQueryDto) {
			System.out.println("=======ballQueryDto=========="+ballQueryDto);
			System.out.println("=======ballQueryDto=========="+ballQueryDto);
			User user = UserExt.getUser();
			ballQueryDto.setType(user.getObjectType());
			ballQueryDto.setId(user.getObjectId());
			@@ -357,12 +356,11 @@
			game.setBlue(""+sutuId);
			game.setRed(""+sutuId1);

			// 生成设备二维码
			// 生成红蓝sutu二维码
			HashMap<String, String> blueCode = new HashMap<>();
			blueCode.put("scan_type", "1000");
			blueCode.put("sutu_id", ""+sutuId);
			blueCode.put("space_id", st.getId() + "");

			HashMap<String, String> redCode = new HashMap<>();
			redCode.put("scan_type", "1000");
			redCode.put("sutu_id", sutuId1+"");
			@@ -377,16 +375,10 @@
			MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
			String s = OssUploadUtil.ossUpload("img/", blueFile);
			String s1 = OssUploadUtil.ossUpload("img/", redFile);
			// MultipartFile multipartFile = convert(blueImage);
			// MultipartFile multipartFile1 = convert(redImage);
			//
			// String s = OssUploadUtil.ossUpload("img/", multipartFile);
			// String s1 = OssUploadUtil.ossUpload("img/", multipartFile1);
			game.setBlueCode(s);
			game.setRedCode(s1);
			Integer gameId = ballClient.save(game);
			List<TGameConfig> gameConfigList = new ArrayList<>();

			//玩湃跨城赛
			TGameConfig gameConfigkuacheng = new TGameConfig();
			gameConfigkuacheng.setId(kcId);
			@@ -400,9 +392,7 @@
			System.out.println("========gameConfig======"+gameConfigkuacheng);
			gameConfigList.add(gameConfigkuacheng);
			System.out.println("======gameConfigList======="+gameConfigList);

			//社区冠军赛

			TGameConfig gameConfigshequ = new TGameConfig();
			gameConfigshequ.setId(shequIId);
			gameConfigshequ.setGameId(shequId);
			@@ -1458,42 +1448,25 @@
			String[] dates = times.split(";");

			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			try {
			String start = dates[0];
			String startDateStr = start.substring(0, start.lastIndexOf("-"));
			Date startDate = format.parse(startDateStr);

			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();
			}
			String end = dates[dates.length - 1];
			String[] str = end.split(" ");
			String endDateStr = str[0] + " " + str[1].substring(str[1].indexOf("-") + 1);
			Date endDate = format.parse(endDateStr);
			siteBooking.setStartTime(startDate);
			siteBooking.setEndTime(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();