From 696daad0798c29631ccda2d98ca52eedcbf2fcb4 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 20:57:27 +0800
Subject: [PATCH] bug：登录问题
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 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 59bc153..3495e14 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
@@ -40,6 +40,7 @@
import com.dsh.guns.modular.system.service.TOperatorService;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -54,6 +55,8 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -342,18 +345,14 @@
model.addAttribute("typeNames",strings3);
String halfNames = site.getHalfName();
- ArrayList<String> strings2 = new ArrayList<>();
- String[] split = halfNames.split(",");
- String halfName=null;
- for (int i = 0; i < split.length; i++) {
- if(i==0){
- halfName = split[0];
- }else {
- strings2.add(split[i]);
- }
+ if (StringUtils.isNotBlank(halfNames) && site.getIshalf().equals(1)) {
+ List<String> strings2 = Arrays.asList(halfNames.split(","));
+ model.addAttribute("halfNames",strings2);
+ model.addAttribute("halfName",strings2.get(0));
+ }else {
+ model.addAttribute("halfNames", Collections.emptyList());
+ model.addAttribute("halfName", "");
}
- model.addAttribute("halfNames",strings2);
- model.addAttribute("halfName",halfName);
// 显式传递运营商ID和是否可预约字段，确保回显正确
model.addAttribute("operatorId", site.getOperatorId());
model.addAttribute("reservation", site.getReservation());
@@ -443,18 +442,14 @@
String halfNames = site.getHalfName();
- ArrayList<String> strings2 = new ArrayList<>();
- String[] split = halfNames.split(",");
- String halfName=null;
- for (int i = 0; i < split.length; i++) {
- if(i==0){
- halfName = split[0];
- }else {
- strings2.add(split[i]);
- }
+ if (StringUtils.isNotBlank(halfNames) && site.getIshalf().equals(1)) {
+ List<String> strings2 = Arrays.asList(halfNames.split(","));
+ model.addAttribute("halfNames",strings2);
+ model.addAttribute("halfName",strings2.get(0));
+ }else {
+ model.addAttribute("halfNames", Collections.emptyList());
+ model.addAttribute("halfName", "");
}
- model.addAttribute("halfNames",strings2);
- model.addAttribute("halfName",halfName);
List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
model.addAttribute("list",site);
@@ -549,8 +544,8 @@
map.put("name",site.getName());
map.put("space_id",store.getId().toString());
String s = HttpRequestUtil.postRequest
-// ("https://port.daowepark.com/v7/user_api/general/addSpaceArea", map);
- ("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
+ ("https://port.daowepark.com/v7/user_api/general/addSpaceArea", map);
+// ("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
String area_id = data.getString("area_id");
@@ -565,6 +560,11 @@
// 保存价格数据
if (site.getPriceDTOS() != null && !site.getPriceDTOS().isEmpty()) {
saveSitePriceDetails(site.getId(), site.getPriceDTOS());
+ List<Site.PriceDTO> priceDTOS = site.getPriceDTOS();
+ site.setAppointmentStartTime(priceDTOS.get(0).getStartTime());
+ site.setAppointmentEndTime(priceDTOS.get(priceDTOS.size()-1).getEndTime());
+ siteClient.addSite(site);
+
}
return ResultUtil.success("添加成功");
@@ -589,7 +589,7 @@
sitePrice.setTargetAudience(detail.getTargetAudience());
sitePrice.setFieldType(detail.getFieldType());
sitePrice.setCashPrice(detail.getCashPrice() != null ? BigDecimal.valueOf(detail.getCashPrice()) : BigDecimal.ZERO);
- sitePrice.setCoinPrice(detail.getCoinPrice() != null ? BigDecimal.valueOf(detail.getCoinPrice()) : BigDecimal.ZERO);
+ sitePrice.setCoinPrice(detail.getCoinPrice() != null ? detail.getCoinPrice() : 0);
sitePrice.setInsertTime(now);
sitePrice.setUpdateTime(now);
@@ -634,6 +634,11 @@
// 先删除原有价格数据
sitePriceService.remove(new QueryWrapper<TSitePrice>().eq("siteId", site.getId()));
saveSitePriceDetails(site.getId(), site.getPriceDTOS());
+ List<Site.PriceDTO> priceDTOS = site.getPriceDTOS();
+ site.setAppointmentStartTime(priceDTOS.get(0).getStartTime());
+ site.setAppointmentEndTime(priceDTOS.get(priceDTOS.size()-1).getEndTime());
+ siteClient.addSite(site);
+
}
return ResultUtil.success();
}
--
Gitblit v1.7.1