From 4b22e543a050b9f8bf8bdab1f0f1e5a7ebbe75a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 18:09:49 +0800
Subject: [PATCH] 硬件回调
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 ec90d09..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
@@ -303,13 +303,14 @@
game.setOperationId(0);
}
System.out.println("============"+game);
-
+ TStore tStore = storeService.getById(store);
+ game.setOperationId(tStore.getOperatorId());
// 判断是新增还是修改 修改不会重新生成sutuId
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);
+ 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);
JSONArray data = jsonObject5.getJSONArray("data");
@@ -332,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 字段的值
@@ -569,7 +570,14 @@
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) {
@@ -590,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";
}
@@ -868,6 +876,7 @@
@Autowired
private IUserService userService;
+
@RequestMapping("/yueyue_info/{id}")
public String yueyue_info(@PathVariable("id") Integer id,Model model) {
@@ -933,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();
@@ -1023,8 +1031,13 @@
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){
@@ -1039,8 +1052,12 @@
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;
}
--
Gitblit v1.7.1