Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-11-05 faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb

 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";
    }
    /**
@@ -533,6 +540,7 @@
        site.setInsertTime(new Date());
        site.setState(1);
        site.setOperatorId(store.getOperatorId());

//        site.setOperatorId(UserExt.getUser().getObjectId());

        // 添加场地
@@ -547,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);

@@ -613,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()) {