From faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 15:13:55 +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/code/TSiteController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index cd757eb..2ba8e6d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -354,7 +354,9 @@
}
model.addAttribute("halfNames",strings2);
model.addAttribute("halfName",halfName);
-
+ // 显式传递运营商ID和是否可预约字段，确保回显正确
+ model.addAttribute("operatorId", site.getOperatorId());
+ model.addAttribute("reservation", site.getReservation());
// 添加价格配置相关字段
TSite fullSite = siteService.getById(id);
model.addAttribute("targetAudience", fullSite.getTargetAudience());
@@ -466,6 +468,11 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("stores",stores);
+ // 显式传递运营商ID和是否可预约字段，确保回显正确
+ model.addAttribute("operatorId", site.getOperatorId());
+ model.addAttribute("reservation", site.getReservation());
+ model.addAttribute("targetAudience", site.getTargetAudience());
+ model.addAttribute("walkinCapacity", site.getWalkinCapacity());
return PREFIX + "TSite_edit.html";
}
/**
@@ -487,6 +494,20 @@
new QueryWrapper<TSitePrice>().eq("siteId", siteId)
);
return ResultUtil.success(prices);
+ }
+
+ /**
+ * 管理后台 - 获取场地预约时间段数据（供预约新增页面使用）
+ */
+ @ResponseBody
+ @RequestMapping("/querySiteTimes")
+ public ResultUtil querySiteTimes(Integer id, String day, String halfName, String siteName, Integer targetAudience) {
+ try {
+ return ResultUtil.success(siteService.querySiteTimes(id, day, halfName, siteName, targetAudience));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.error("获取时间段失败");
+ }
}
/**
@@ -519,6 +540,7 @@
site.setInsertTime(new Date());
site.setState(1);
site.setOperatorId(store.getOperatorId());
+
// site.setOperatorId(UserExt.getUser().getObjectId());
// 添加场地
@@ -533,6 +555,9 @@
String area_id = data.getString("area_id");
Integer integer = Integer.valueOf(area_id);
site.setId(integer);
+ if (site.getIshalf()==2){
+ site.setHalfName("");
+ }
Integer integer1 = siteClient.addSite1(site);
// Integer integer = Integer.valueOf(spaceId);
@@ -581,7 +606,9 @@
@ResponseBody
@RequestMapping(value = "/updateSite")
public ResultUtil updateSite(@RequestBody Site site) {
- if(site.getInsuranceImg().equals("")){
+ System.out.println(JSONObject.toJSONString(site));
+ // 防止空指针异常：如果 insuranceImg 为 null 或空字符串，设置为 null
+ if(site.getInsuranceImg() == null || site.getInsuranceImg().equals("")){
site.setInsuranceImg(null);
}
Store store = storeClient.getStoreById(site.getStoreId());
@@ -597,6 +624,9 @@
site.setCityManagerId(store.getOperatorId());
site.setInsertTime(new Date());
site.setState(1);
+ if (site.getIshalf()==2){
+ site.setHalfName("");
+ }
siteClient.addSite(site);
// 保存价格数据
if (site.getPriceDTOS() != null && !site.getPriceDTOS().isEmpty()) {
--
Gitblit v1.7.1