From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 183 ++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 77 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 ed267ec..0080217 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
@@ -231,7 +231,6 @@
return ResultUtil.success();
}
-
public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
// 将 BufferedImage 转换为字节数组
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -251,29 +250,7 @@
return multipartFile;
}
- public static void main(String[] args) throws Exception {
- // 生成红蓝sutu二维码
- HashMap<String, String> blueCode = new HashMap<>();
- blueCode.put("scan_type", "1000");
- blueCode.put("sutu_id", ""+1041);
- blueCode.put("space_id", 46 + "");
- HashMap<String, String> redCode = new HashMap<>();
- redCode.put("scan_type", "1000");
- redCode.put("sutu_id", 1040+"");
- redCode.put("space_id", 46 + "");
- String blueS= "{\"scan_type\": 1000, \"space_id\": "+46+", \"sutu_id\": "+1041+"}";
- String redS= "{\"scan_type\": 1000, \"space_id\": "+46+", \"sutu_id\": "+1040+"}";
- MyQrCodeUtil.createCodeToFile(blueS);
- MyQrCodeUtil.createCodeToFile(redS);
- BufferedImage blueImage = QRCodeUtil.createImage(blueS);
- BufferedImage redImage = QRCodeUtil.createImage(redS);
- MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- String s = OssUploadUtil.ossUpload("img/", blueFile);
- String s1 = OssUploadUtil.ossUpload("img/", redFile);
- System.err.println("蓝色"+ s);
- System.err.println("蓝色"+s1);
- }
+
@RequestMapping("/save")
@ResponseBody
public ResultUtil save(Integer id, String operationId, String red, String blue, String province, String city, Integer site, Integer store
@@ -287,6 +264,7 @@
, 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 v3, BigDecimal v3Coin, BigDecimal v3Cash, String v3Image, BigDecimal v3Int, Integer v3Id,Integer v3IId
,String sutuName
) throws Exception {
@@ -325,21 +303,21 @@
game.setOperationId(0);
}
System.out.println("============"+game);
-
+ TStore tStore = storeService.getById(store);
+ game.setOperationId(tStore.getOperatorId());
// 判断是新增还是修改 修改不会重新生成sutuId
- if (game.getId()==null){
+ if (game.getId()==null) {
HashMap<String, String> map5 = new HashMap<>();
- map5.put("space_id", store+"");
- map5.put("area_id", site+"");
- String s5 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map5);
+ map5.put("space_id", store + "");
+ map5.put("area_id", site + "");
+ String s5 = HttpRequestUtil.getRequest("https://port.daowepark.com/v7/user_api/general/get_space_sutu", map5);
System.err.println(s5);
JSONObject jsonObject5 = new JSONObject(s5);
- // 获取 data 字段的值
JSONArray data = jsonObject5.getJSONArray("data");
Integer temp = null; // 临时sutuid
Integer temp1 = null; // 临时sutuid
TSite si = siteService.getById(site);
- if (data.length() == 0){
+ if (data.length() == 0) {
// 这个场地没有添加过sutu
HashMap<String, String> map3 = new HashMap<>();
HashMap<String, String> map4 = new HashMap<>();
@@ -355,8 +333,8 @@
map4.put("name", red);
map3.put("city_code", city);
map4.put("city_code", city);
- String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
- String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
+ String s3 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
+ String s4 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
JSONObject jsonObject = new JSONObject(s3);
JSONObject jsonObject1 = new JSONObject(s4);
// 获取 data 字段的值
@@ -367,39 +345,39 @@
String sutuIdValue1 = dataObject1.getString("sutu_id");
Integer sutuId = Integer.valueOf(sutuIdValue);
Integer sutuId1 = Integer.valueOf(sutuIdValue1);
- game.setBlue(""+sutuId);
- game.setRed(""+sutuId1);
+ 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("sutu_id", "" + sutuId);
blueCode.put("space_id", si.getId() + "");
HashMap<String, String> redCode = new HashMap<>();
redCode.put("scan_type", "1000");
- redCode.put("sutu_id", sutuId1+"");
+ redCode.put("sutu_id", sutuId1 + "");
redCode.put("space_id", si.getId() + "");
- String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId+"}";
- String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId1+"}";
+ String blueS = "{\"scan_type\": 1000, \"space_id\": " + si.getId() + ", \"sutu_id\": " + sutuId + "}";
+ String redS = "{\"scan_type\": 1000, \"space_id\": " + si.getId() + ", \"sutu_id\": " + sutuId1 + "}";
MyQrCodeUtil.createCodeToFile(blueS);
MyQrCodeUtil.createCodeToFile(redS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
BufferedImage redImage = QRCodeUtil.createImage(redS);
- MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
+ MultipartFile redFile = convert(redImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
String s = OssUploadUtil.ossUpload("img/", blueFile);
String s1 = OssUploadUtil.ossUpload("img/", redFile);
game.setBlueCode(s);
game.setRedCode(s1);
- }else{
- Integer sutuid=0;
- Integer sutuid1=0;
+ } else {
+ Integer sutuid = 0;
+ Integer sutuid1 = 0;
JSONObject element = data.getJSONObject(0);
- if (site==27){
- sutuid=1036;
- sutuid1=1037;
+ if (site == 27) {
+ sutuid = 1036;
+ sutuid1 = 1037;
game.setBlue(sutuid.toString());
game.setRed(sutuid1.toString());
- }else{
+ } else {
sutuid = element.getInt("id");
game.setBlue(sutuid.toString());
JSONObject element1 = data.getJSONObject(1);
@@ -409,27 +387,28 @@
// 生成红蓝sutu二维码
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("scan_type", "1000");
- blueCode.put("sutu_id", ""+sutuid);
+ blueCode.put("sutu_id", "" + sutuid);
blueCode.put("space_id", si.getId() + "");
HashMap<String, String> redCode = new HashMap<>();
redCode.put("scan_type", "1000");
- redCode.put("sutu_id", sutuid1+"");
+ redCode.put("sutu_id", sutuid1 + "");
redCode.put("space_id", si.getId() + "");
- String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuid+"}";
- String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuid1+"}";
+ String blueS = "{\"scan_type\": 1000, \"space_id\": " + si.getId() + ", \"sutu_id\": " + sutuid + "}";
+ String redS = "{\"scan_type\": 1000, \"space_id\": " + si.getId() + ", \"sutu_id\": " + sutuid1 + "}";
MyQrCodeUtil.createCodeToFile(blueS);
MyQrCodeUtil.createCodeToFile(redS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
BufferedImage redImage = QRCodeUtil.createImage(redS);
- MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
+ MultipartFile redFile = convert(redImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
String s = OssUploadUtil.ossUpload("img/", blueFile);
String s1 = OssUploadUtil.ossUpload("img/", redFile);
game.setBlueCode(s);
game.setRedCode(s1);
}
+
}
-
+
Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
//玩湃跨城赛
@@ -556,6 +535,18 @@
gameConfigly.setIntegral(lyInt);
gameConfigly.setOtherId(gameId);
gameConfigList.add(gameConfigly);
+
+ //激战3V3
+ TGameConfig gameConfigv3 = new TGameConfig();
+ gameConfigv3.setGameId(v3Id);
+ gameConfigv3.setId(v3IId);
+ gameConfigv3.setCash(v3Cash);
+ gameConfigv3.setImg(v3Image);
+ gameConfigv3.setName(v3);
+ gameConfigv3.setPlayCoin(v3Coin);
+ gameConfigv3.setIntegral(v3Int);
+ gameConfigv3.setOtherId(gameId);
+ gameConfigList.add(gameConfigv3);
HashMap<String, String> map1 = new HashMap<>();
HashMap<String, String> map2 = new HashMap<>();
@@ -565,13 +556,13 @@
// 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);
+// String s1 = HttpRequestUtil.postRequest("https://port.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);
+// String s2 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addDevice", map2);
@@ -579,6 +570,15 @@
return null;
}
+ public static void main(String[] args) throws Exception {
+ String blueS = "{\"vipDetail\":1,role\":1,\"time\":[{\"start_time\":\"2025-08-25 09:00:00\",\"end_time\":\"2025-08-30 23:00:00\"}]}";
+ MyQrCodeUtil.createCodeToFile(blueS);
+ BufferedImage blueImage = QRCodeUtil.createImage(blueS);
+ MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
+ String s = OssUploadUtil.ossUpload("img/", blueFile);
+ System.err.println(s);
+ }
+
@RequestMapping("/pre_add")
public String add(Model model) {
@@ -598,7 +598,7 @@
}
if (objectType == 2){
- model.addAttribute("is3","true");
+ model.addAttribute("is2","true");
model.addAttribute("oId",UserExt.getUser().getObjectId());
return PREFIX+"ball_pre_add2.html";
}
@@ -659,6 +659,9 @@
TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
model.addAttribute("ly",ly);
+
+ TGameConfig v3 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 0));
+ model.addAttribute("v3",v3);
Integer objectType = UserExt.getUser().getObjectType();
@@ -728,7 +731,9 @@
TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
model.addAttribute("ly",ly);
-
+
+ TGameConfig v3 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 0));
+ model.addAttribute("v3",v3);
return PREFIX+"ball_pre_info.html";
@@ -871,6 +876,7 @@
@Autowired
private IUserService userService;
+
@RequestMapping("/yueyue_info/{id}")
public String yueyue_info(@PathVariable("id") Integer id,Model model) {
@@ -936,8 +942,7 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
- Site site = siteClient.listById(book.getSiteId());
+ TSite site = siteService.getById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
String appointmentEndTime = site.getAppointmentEndTime();
@@ -1026,9 +1031,33 @@
List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
tCoursePackages.addAll(coursePackageByStoreId);
}
+
List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
+ if (tCoursePackages.isEmpty()){
+ coursePackageByStoreIds.add(-1);
+ }
+ studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
+
+ }
+ // 如果当前登陆人是门店 只查询该门店下的课包的数据
+ if(UserExt.getUser().getObjectType() == 3){
+ // 先查询这个运营商下的所有门店ids
+
+ List<Integer> storeIds = new ArrayList<>();
+ storeIds.add(UserExt.getUser().getObjectId());
+ // 根据门店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());
+ if (tCoursePackages.isEmpty()){
+ coursePackageByStoreIds.add(-1);
+ }
studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
}
+
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
return pays;
}
@@ -1133,22 +1162,22 @@
}
}
- 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();
- }
- }
+// 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;
}
--
Gitblit v1.7.1