bug：收入类型统计数据问题解决

刘帅

2026-09-21 620a310bdcfb1d8f1b49bf163413afeb522e1b2f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java

@@ -56,6 +56,7 @@
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;
@@ -348,6 +349,9 @@
            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", "");
        }
        // 显式传递运营商ID和是否可预约字段，确保回显正确
        model.addAttribute("operatorId", site.getOperatorId());
@@ -438,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);
@@ -544,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");
@@ -560,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("添加成功");
@@ -584,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);
            
@@ -629,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();
    }