后台代码提交

44323

2023-10-09 5df006aac405fe996fff71f7854e37c324892367

后台代码提交

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

@@ -102,8 +102,60 @@
        }
        return new ArrayList<>();
    }

    @RequestMapping("/listAll1")
    @ResponseBody
    public Object listAll1(String spaceId,String type,String date,String cityCode){
        if(spaceId==null){
            spaceId="";
        }
        if(type==null){
            type="y";
        }
        if(date==null){
            date="";
        }
        if(cityCode==null){
            cityCode="";
        }
//        String apiUrl1 = "https://try.daowepark.com/v7/user_api/general/accuracyGameRanking?space_id=1001"+spaceId+"&type="+type+"&date="+date+"&city_code="+cityCode;
        String apiUrl1 = "https://try.daowepark.com/v7/user_api/general/accuracyGameRanking?space_id="+spaceId+"&type="+type+"&date="+date+"&city_code="+cityCode;
        URL url1 = null;
        try {
            url1 = new URL(apiUrl1);
            HttpURLConnection connection1 = (HttpURLConnection) url1.openConnection();
            connection1.setRequestMethod("GET");
            // 发送请求并获取响应
            int responseCode1 = connection1.getResponseCode();
            if (responseCode1 == HttpURLConnection.HTTP_OK) {
                BufferedReader reader1 = new BufferedReader(new InputStreamReader(connection1.getInputStream()));
                String line1;
                StringBuilder response1 = new StringBuilder();
                while ((line1 = reader1.readLine()) != null) {
                    response1.append(line1);
                }
                reader1.close();
                // 处理响应数据
                String data1 = response1.toString();
                // 使用Jackson库将JSON字符串转换为Java对象
                ObjectMapper objectMapper1 = new ObjectMapper();
                AccuracyGameOne res1 = objectMapper1.readValue(data1, AccuracyGameOne.class);
                List<AccuracyGameDataOne> data2 = res1.getData();
                return data2;
            }
        } catch (ProtocolException e) {
            e.printStackTrace();
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        } catch (MalformedURLException e) {
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return new ArrayList<>();
    }
    /**
     * 跳转到充值记录页面
     * 跳转到智慧球场数据统计页面
     */
    @RequestMapping("")
    public String index(Model model) {
@@ -153,7 +205,7 @@
     */
    @RequestMapping("/list")
    @ResponseBody
    public Object list(Integer storeId) {
    public Object list(String storeId) {
        Map<String, Object> result = new HashMap<>();
        try {
            // 年度数据
@@ -162,7 +214,7 @@
            // 创建 POST 请求
            HttpPost httpPost = new HttpPost("https://try.daowepark.com/v7/user_api/general/getBatterData");
            // 设置请求体数据
            String postData = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id="+""+"&date_type=y";
            String postData = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id="+storeId+"&date_type=y"+"&year=";

            StringEntity entity = new StringEntity(postData, ContentType.APPLICATION_FORM_URLENCODED);
            httpPost.setEntity(entity);
@@ -196,7 +248,7 @@
            // 创建 POST 请求
            HttpPost httpPost1 = new HttpPost("https://try.daowepark.com/v7/user_api/general/getBatterData");
            // 设置请求体数据
            String postData1 = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id=1001&date_type=m&year=2022";
            String postData1 = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id=1001"+""+"&date_type=m"+"&year="+year;
            StringEntity entity1 = new StringEntity(postData1, ContentType.APPLICATION_FORM_URLENCODED);
            httpPost1.setEntity(entity1);
            // 执行请求
@@ -204,13 +256,12 @@
            // 处理响应
            HttpEntity responseEntity1 = response1.getEntity();
            if (responseEntity1 != null) {
                String responseData = EntityUtils.toString(responseEntity1);
                String responseData1 = EntityUtils.toString(responseEntity1);
                ObjectMapper objectMapper = new ObjectMapper();
                Batter batter = objectMapper.readValue(responseData, Batter.class);
                Batter batter = objectMapper.readValue(responseData1, Batter.class);
                result.put("totalNumber", batter.getData().getAll_batter_num());
                result.put("totalTime", batter.getData().getAll_batter_time());
                List<BatterData> dataList = batter.getData().getList();

                // 月度数据
                result.put("mDataList", dataList);
            }
@@ -351,7 +402,44 @@
        return result;
    }
    /**
     * 获取跨城赛统计
     * 获取90°准度赛全球总数
     */
    @RequestMapping("/cityGameOne")
    @ResponseBody
    public Object cityGameOne() {
        Map<String, Object> result = new HashMap<>();
        try {
            String apiUrl = "https://try.daowepark.com/v7/user_api/general/getAccuracyGameCount?space_id=";
            URL url = new URL(apiUrl);
            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
            connection.setRequestMethod("GET");
            // 发送请求并获取响应
            int responseCode = connection.getResponseCode();
            if (responseCode == HttpURLConnection.HTTP_OK) {
                BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
                String line;
                StringBuilder response = new StringBuilder();
                while ((line = reader.readLine()) != null) {
                    response.append(line);
                }
                reader.close();
                // 处理响应数据
                String data = response.toString();
                // 使用Jackson库将JSON字符串转换为Java对象
                ObjectMapper objectMapper = new ObjectMapper();
                CityGame res = objectMapper.readValue(data, CityGame.class);
                result.put("totalNum", res.getData().getTotal_num());
                    return result;
                }
            }
         catch (IOException e) {
            e.printStackTrace();
        }
        return result;
    }

    /**
     * 获取跨城赛统计全球总数
     */
    @RequestMapping("/cityGame")
    @ResponseBody
@@ -377,18 +465,11 @@
                // 使用Jackson库将JSON字符串转换为Java对象
                ObjectMapper objectMapper = new ObjectMapper();
                CityGame res = objectMapper.readValue(data, CityGame.class);
                // 场地总入场人数
                String totalNum = "";
                for (CityGameData datum : res.getData()) {
                    totalNum = datum.getTotal_num();
                }
                result.put("totalNum", totalNum);


                    return result;
                }
                result.put("totalNum", res.getData().getTotal_num());
                return result;
            }
         catch (IOException e) {
        }
        catch (IOException e) {
            e.printStackTrace();
        }
        return result;

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

@@ -53,8 +53,6 @@
    private SiteClient siteClient;
    private String PREFIX = "/system/gateData/";



    /**
     * 跳转到充值记录页面
     */
@@ -63,15 +61,13 @@
        return PREFIX + "GateData.html";
    }
    /**
     * 获取教练类型列表
     * 获取闸机数据列表
     */
    @RequestMapping("/list")
    @ResponseBody
    public Object list() {
        List<Site> list = siteClient.getList();
        try {
            for (Site site : list) {
                String apiUrl = "https://try.daowepark.com/v7/user_api/general/spaceDoorData?space_id=" + site.getId();
                String apiUrl = "https://try.daowepark.com/v7/user_api/general/spaceDoorData?space_id=1001";
                URL url = new URL(apiUrl);
                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
                connection.setRequestMethod("GET");
@@ -106,6 +102,46 @@
                } else {
                    System.out.println("请求失败: " + responseCode);
                }
        } catch (IOException e) {
            e.printStackTrace();
        }
        return new ArrayList<>();
    }
    /**
     * 获取教练类型列表
     */
    @RequestMapping("/totalNum")
    @ResponseBody
    public Object totalNum() {
        try {
            String apiUrl = "https://try.daowepark.com/v7/user_api/general/spaceDoorData?space_id=1001";
            URL url = new URL(apiUrl);
            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
            connection.setRequestMethod("GET");
            // 发送请求并获取响应
            int responseCode = connection.getResponseCode();
            if (responseCode == HttpURLConnection.HTTP_OK) {
                BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
                String line;
                StringBuilder response = new StringBuilder();
                while ((line = reader.readLine()) != null) {
                    response.append(line);
                }
                reader.close();
                // 处理响应数据
                String data = response.toString();
                // 使用Jackson库将JSON字符串转换为Java对象
                ObjectMapper objectMapper = new ObjectMapper();
                GateDataResponse res = objectMapper.readValue(data, GateDataResponse.class);
                // 访问Java对象中的数据
                int code = res.getCode();
                String message = res.getMessage();
                // 场地总入场人数
                int totalNum = res.getData().getTotal_num();
                return totalNum;

            } else {
                System.out.println("请求失败: " + responseCode);
            }
        } catch (IOException e) {
            e.printStackTrace();

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

@@ -20,12 +20,11 @@
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.SinataUtil;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IUserService;
import com.dsh.guns.modular.system.service.TOperatorCityService;
import com.dsh.guns.modular.system.service.TOperatorService;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.service.impl.TOperatorUserServiceImpl;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
import org.apache.catalina.valves.RemoteIpValve;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -48,6 +47,8 @@
    private TOperatorService operatorService;
    @Autowired
    private TOperatorCityService operatorCityService;
    @Autowired
    private IOperatorUserService operatorUserService;
    @Autowired
    private IUserService userService;
    @Autowired
@@ -127,7 +128,59 @@
        page.setRecords(list);
        return super.packForBT(page);
    }

    /**
     * 跳转运营商商户去认证页面
     */
    @RequestMapping("/proportionAuth/{id}")
    public String proportionAuth(Model model,@PathVariable("id") Integer id) {
        model.addAttribute("operatorId",id);
        return PREFIX + "OperatorUser_proportionAuth.html";
    }
    /**
     * 商户认证提交
     */
    @RequestMapping(value = "/auth")
    @ResponseBody
    public Object auth(Integer alipayType,Integer wechatType,String alipayNum,String wechatNum,Integer operatorId ) {
        TOperator id = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", operatorId));
        OperatorUser operatorUser = new OperatorUser();
        operatorUser.setUserId(id.getUserId());
        operatorUser.setAlipay("支付宝");
        operatorUser.setWechat("微信");
        operatorUser.setWechatType(wechatType);
        operatorUser.setAlipayType(alipayType);
        operatorUser.setAlipayNum(alipayNum);
        operatorUser.setWechatNum(wechatNum);
        operatorUser.setOperatorId(operatorId);
        operatorUserService.save(operatorUser);
        // 修改运营商状态为 已认证
        id.setStatus(2);
        operatorService.updateById(id);
        return SUCCESS_TIP;
    }
    /**
     * 分账比例提交
     */
    @RequestMapping(value = "/proportion")
    @ResponseBody
    public Object auth(String alipayProportion,String wechatProportion,Integer operatorIdOne ) {
        OperatorUser id = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("id", operatorIdOne));
        id.setAlipayProportion(alipayProportion);
        id.setWechatProportion(wechatProportion);
        operatorUserService.updateById(id);
        return SUCCESS_TIP;
    }
    /**
     * 跳转运营商设置分账比例页面
     */
    @RequestMapping("/proportion/{id}")
    public String proportion(Model model,@PathVariable("id") Integer id) {
        OperatorUser o = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("operatorId", id));
        model.addAttribute("operatorIdOne",o.getId());
        model.addAttribute("alipayProportion",o.getAlipayProportion());
        model.addAttribute("wechatProportion",o.getWechatProportion());
        return PREFIX + "OperatorUser_proportion.html";
    }
    /**
     * 批量重置密码
     * @return
@@ -140,7 +193,7 @@
            List<Integer> userIds = list.stream()
                    .map(TOperator::getUserId)
                    .collect(Collectors.toList());
            String a123456 = SecureUtil.md5("123456");
            String a123456 = SecureUtil.md5("a123456");
            List<User> users = userService.list(new QueryWrapper<User>().in("id", userIds));
            for (User user : users) {
                user.setPassword(a123456);

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

@@ -62,22 +62,7 @@
    }


    /**
     * 跳转运营商商户去认证页面
     */
    @RequestMapping("/proportion/{id}")
    public String update(Model model,@PathVariable("id") Integer id) {
        List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        model.addAttribute("provinceList",provinceList);
        List<Bank> bankList = operatorService.getBankList();
        TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("cityManagerId", id));
        model.addAttribute("storeName",store.getName());
        TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(store.getStoreStaffId());
        model.addAttribute("storeStaff",storeByStoreStaffId.getName());
        model.addAttribute("storePhone",storeByStoreStaffId.getPhone());
        model.addAttribute("bankList",bankList);
        return PREFIX + "OperatorUser_auth.html";
    }

    /**
     * 获取运营商列表
     */
@@ -90,23 +75,4 @@
        return super.packForBT(page);
    }

    /**
     * 批量重置密码
     * @return
     */
    @RequestMapping(value = "/addProportion")
    @ResponseBody
    public Object pwd(Integer id, BigDecimal alipay,BigDecimal wechat) {
        List<OperatorUser> list = operatorUserService.list(new QueryWrapper<OperatorUser>().eq("operatorId", id));
        for (OperatorUser operatorUser : list) {
            if (operatorUser.getPlatform()==1){
                operatorUser.setProportion(wechat);
                operatorUserService.updateById(operatorUser);
            }else {
                operatorUser.setProportion(alipay);
                operatorUserService.updateById(operatorUser);
            }
        }
        return SUCCESS_TIP;
    }
}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/AccuracyGameDataOne.java

New file
@@ -0,0 +1,16 @@
package com.dsh.guns.modular.system.model;

import lombok.Data;

/**
 * 获取游戏列表
 */
@Data
public class AccuracyGameDataOne {
   private int account_id;
   private int score;
   private int match_id;
   private String name;
   private String avatar;
   private String rank;
}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/AccuracyGameOne.java

New file
@@ -0,0 +1,16 @@
package com.dsh.guns.modular.system.model;

import lombok.Data;

import java.util.List;

/**
 * 获取游戏列表
 */
@Data
public class AccuracyGameOne {
    private int code;
    private String message;
    private List<AccuracyGameDataOne> data;
    private String nextUrl;
}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CityGame.java

@@ -11,6 +11,6 @@
public class CityGame {
    private int code;
    private String message;
    private List<CityGameData> data;
    private CityGameData data;
    private String nextUrl;
}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperatorUser.java

@@ -1,5 +1,8 @@
package com.dsh.guns.modular.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -8,16 +11,26 @@
@TableName("t_operator_user")
@Data
public class OperatorUser {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String province;
    private Integer provinceCode;
    private String city;
    private Integer cityCode;
    @TableField(value = "userId")
    private Integer userId;
    private Integer platform;
    private Integer type;
    private BigDecimal proportion;
    private Integer state;
    private Integer status;
    @TableField(value = "alipay")
    private String alipay;
    @TableField(value = "alipayProportion")
    private String alipayProportion;
    @TableField(value = "alipayNum")
    private String alipayNum;
    @TableField(value = "wechat")
    private String wechat;
    @TableField(value = "wechatProportion")
    private String wechatProportion;
    @TableField(value = "wechatNum")
    private String wechatNum;
    @TableField(value = "alipayType")
    private Integer alipayType;
    @TableField(value = "wechatType")
    private Integer wechatType;
    @TableField(value = "operatorId")
    private Integer operatorId;
}

 cloud-server-management/src/main/resources/TOperatorUserMapper.xml

@@ -1,37 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.course.mapper.TOperatorUserMapper">
    <select id="listAll" resultType="java.util.Map">
        select t1.id as id, t1.platform,t1.type,t1.proportion,CONCAT(t1.province,t1.city) as provinceAndCity
        t1.state as state,t1.status as status,t2.name as userName,t2.phone as phone from t_operatorUser t1
        left join sys_user t2 on t1.userId = t2.id
        where 1=1
        <if test="province != null and province != ''">
            and t1.provinceCode =  #{province}
        </if>
        <if test="city != null and city != ''">
            and t1.cityCode =  #{city}
        </if>
        <if test="userName != null and userName != ''">
            and t2.name like CONCAT('%',#{userName},'%')
        </if>
        <if test="phone != null and phone != ''">
            and t2.phone like CONCAT('%',#{phone},'%')
        </if>
        <if test="platform != null and platform != ''">
            and t1.platform =  #{platform}
        </if>
        <if test="type != null and type != ''">
            and t1.type =  #{type}
        </if>
        <if test="proportion != null and proportion != ''">
            and t1.proportion =  #{proportion}
        </if>
        <if test="state != null and state != ''">
            and t1.state =  #{state}
        </if>
        <if test="status != null and status != ''">
            and t1.status =  #{status}
        </if>
    </select>

</mapper>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/course/course.html

@@ -4,7 +4,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>课程管理</h5>
                <h5>视频课管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
@@ -35,24 +35,12 @@
                            </div>
                        </div>
                        <div class="hidden-xs" id="managerTableToolbar" role="group">
                            @if(shiro.hasPermission("/course/addCourse")){
                            <#button name="添加" icon="fa-plus" clickFun="Course.addCourse()"/>
                            @}
                            @if(shiro.hasPermission("/course/editCourse")){
                            <#button name="编辑" icon="fa-edit" clickFun="Course.editCourse()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/course/deleteCourse")){
                            <#button name="删除" icon="fa-remove" clickFun="Course.deleteCourse()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/course/upCourse")){
                            <#button name="上架" icon="fa-refresh" clickFun="Course.editCourseState(1)" space="true"/>
                            @}
                            @if(shiro.hasPermission("/course/downCourse")){
                            <#button name="下架" icon="fa-warning" clickFun="Course.editCourseState(2)" space="true"/>
                            @}
                            @if(shiro.hasPermission("/course/detailsCourse")){
                            <#button name="详情" icon="fa-check-circle" clickFun="Course.detailsCourse()" space="true"/>
                            @}
                        </div>
                        <#table id="managerTable"/>
                    </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html

@@ -41,19 +41,6 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal">

            <input hidden id="day" value="${data.dayone}">
            <input hidden id="month" value="${data.monthone}">
            <input hidden id="quarter" value="${data.quarterone}">
            <input hidden id="year" value="${data.yearone}">
            <input hidden id="age1" value="${stuData.age1}">
            <input hidden id="age2" value="${stuData.age2}">
            <input hidden id="age3" value="${stuData.age3}">
            <input hidden id="age4" value="${stuData.age4}">
            <input hidden id="boy" value="${stuData.boy}">
            <input hidden id="girl" value="${stuData.girl}">


            <div class="row">
                <div class="col-sm-10">
                    <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;width: auto">
@@ -61,8 +48,6 @@
                        <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">运营统计</div>
                        <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">教学统计</div>
                    </div>


                    <div class="row" id="content1" style="margin-left: 100px;">
                        <div class="col-sm-11">
                            <div class="form-group">
@@ -86,19 +71,21 @@
                                    </br>
                                    <div class="col-sm-3" style="width: 400px;display: flex">
                                        <#TimeCon id="beginTime" name="时间段:" isTime="false"/>
                                        <#button name="搜索" icon="fa-search" clickFun="search1()"/>
                                        <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
                                    </div>
                                </div>

                                <div class="col-sm-10" style="width: 1500px" >
                                    </br>
                                    </br>
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>会员费收入:<label id="fee1">${data.fee1}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>玩湃币充值收入:<label id="fee2">${data.fee2}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>课程收入:<label id="fee3">${data.fee3}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>活动/赛事收入:<label id="fee4">${data.fee4}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>订场收入:<label id="fee5">${data.fee5}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>商品收入:<label id="fee7">${data.fee7}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>会员费收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>玩湃币充值收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>课程收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>活动收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>订场收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>赛事收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>商品收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <span>其他收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    </br>
                                    </br>
                                    </br>
@@ -252,138 +239,10 @@
            </div>
        </div>
    </div>


</div>
<script src="${ctxPath}/modular/system/dataStatistics/echarts.min.js"></script>
<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
<script>
    function search1(){
        var time = $("#beginTime").val()
        var ajax = new $ax(Feng.ctxPath + "/data/type1", function (data) {

            $("#fee1").text(data.fee1)
            $("#fee2").text(data.fee2)
            $("#fee3").text(data.fee3)
            $("#fee4").text(data.fee4)
            $("#fee5").text(data.fee5)
            $("#fee7").text(data.fee7)
            $("#day").val(data.dayone)
            $("#month").val(data.monthone)
            $("#quarter").val(data.quarterone)
            $("#year").val(data.yearone)





            var chartDom = document.getElementById('cookieTicket');
            var myChart = echarts.init(chartDom);
            var option;
            option = {
                title: {
                    text: '门票收入',
                    subtext: '',
                    left: 'center'
                },
                tooltip: {
                    trigger: 'item'
                },

                series: [
                    {
                        name: 'Access From',
                        type: 'pie',
                        radius: '50%',
                        data: [
                            { value: data.dayone, name: '日卡' },
                            { value: data.monthone, name: '月卡' },
                            { value: data.quarterone, name: '季卡' },
                            { value: data.yearone, name: '年卡' },

                        ],
                        emphasis: {
                            itemStyle: {
                                shadowBlur: 10,
                                shadowOffsetX: 0,
                                shadowColor: 'rgba(0, 0, 0, 0.5)'
                            }
                        }
                    }
                ]
            };
            myChart.setOption(option);

            var chartDom = document.getElementById('cookieCourse');
            var myChart = echarts.init(chartDom);
            var option;
            option = {
                title: {
                    text: '课程收入',
                    subtext: '',
                    left: 'center'
                },
                tooltip: {
                    trigger: 'item'
                },

                series: [
                    {
                        name: 'Access From',
                        type: 'pie',
                        radius: '50%',
                        data:    data.courseData,
                        emphasis: {
                            itemStyle: {
                                shadowBlur: 10,
                                shadowOffsetX: 0,
                                shadowColor: 'rgba(0, 0, 0, 0.5)'
                            }
                        }
                    }
                ]
            };
            myChart.setOption(option);


            var chartDom = document.getElementById('cookieBooking');
            var myChart = echarts.init(chartDom);
            var option;
            option = {
                title: {
                    text: '订场收入',
                    subtext: '',
                    left: 'center'
                },
                tooltip: {
                    trigger: 'item'
                },

                series: [
                    {
                        name: 'Access From',
                        type: 'pie',
                        radius: '50%',
                        data: data.siteData,
                        emphasis: {
                            itemStyle: {
                                shadowBlur: 10,
                                shadowOffsetX: 0,
                                shadowColor: 'rgba(0, 0, 0, 0.5)'
                            }
                        }
                    }
                ]
            };
            myChart.setOption(option);


        }, function (data) {

        });
        ajax.set("time",time);
        ajax.start();
    }
    var ans = [];
    var weekX = [];
    var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -422,6 +281,7 @@
        getContent(1);
        getContent1(1);
        getContent2(1);

        var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
            var list = resp.yearMount;
            console.log(list);
@@ -802,8 +662,6 @@
                }
            ]
        };


        option6  = {
            tooltip: {
                trigger: 'axis'
@@ -857,9 +715,6 @@
                }
            ]
        };



        option7  = {
            tooltip: {
                trigger: 'axis'
@@ -985,41 +840,6 @@
            $("#ensure").show();
            $("#nextB").hide();
        }


        if(type==3){
            var ajax = new $ax(Feng.ctxPath + "/data/stuCourseData", function (data) {

                console.log(data.data1)
                var chartDom = document.getElementById('cookieTeachCourse');
                var myChart = echarts.init(chartDom);
                var option;

                option = {
                    xAxis: {
                        type: 'category',
                        data: data.data1,
                    },
                    yAxis: {
                        type: 'value'
                    },
                    series: [
                        {
                            data: data.data2,
                            type: 'bar'
                        }
                    ]
                };
                myChart.setOption(option);
            }, function (data) {

            });
            ajax.start();
        }




    }
    function getContent1(type){
        //设置点击字体颜色效果
@@ -1054,12 +874,12 @@
        }
    }

</script>
<script>
    $(function(){

        var chartDom = document.getElementById('cookieTicket');
        var myChart = echarts.init(chartDom);
        var option;

        option = {
            title: {
                text: '门票收入',
@@ -1076,10 +896,8 @@
                    type: 'pie',
                    radius: '50%',
                    data: [
                        { value: $("#day").val(), name: '日卡' },
                        { value: $("#month").val(), name: '月卡' },
                        { value: $("#quarter").val(), name: '季卡' },
                        { value: $("#year").val(), name: '年卡' },
                        { value: 1048, name: '年票' },
                        { value: 735, name: '亲子票' },

                    ],
                    emphasis: {
@@ -1095,24 +913,8 @@
    myChart.setOption(option);
    });
    $(function(){
        var courseData = "${data.courseData}"
        courseData =courseData.replace("[","").replace("]","")
        courseData = courseData.split('},')

        var a=[];
        for (let j = 0; j <courseData.length; j++) {
            if(j<courseData.length-1){
                var d = courseData[j].replace("{","").replace("}","").split(",")
                    let obj ={
                        name:d[0].split("=")[1],
                        value:d[1].split("=")[1]
                    }
                    a.push(obj)
            }
        }
        var chartDom = document.getElementById('cookieCourse');
        var myChart = echarts.init(chartDom)

        var myChart = echarts.init(chartDom);
        var option;
        option = {
            title: {
@@ -1129,7 +931,12 @@
                    name: 'Access From',
                    type: 'pie',
                    radius: '50%',
                    data: a,
                    data: [
                        { value: 1048, name: '篮球课' },
                        { value: 735, name: '羽毛课' },
                        { value: 735, name: '足球课' },

                    ],
                    emphasis: {
                        itemStyle: {
                            shadowBlur: 10,
@@ -1143,22 +950,6 @@
        myChart.setOption(option);
    });
    $(function(){
        var courseData = "${data.siteData}"

        courseData =courseData.replace("[","").replace("]","")
        courseData = courseData.split('},')

        var a=[];
        for (let j = 0; j <courseData.length; j++) {
            if(j<courseData.length-1){
                var d = courseData[j].replace("{","").replace("}","").split(",")
                let obj ={
                    name:d[0].split("=")[1],
                    value:d[1].split("=")[1]
                }
                a.push(obj)
            }
        }
        var chartDom = document.getElementById('cookieBooking');
        var myChart = echarts.init(chartDom);
        var option;
@@ -1177,7 +968,12 @@
                    name: 'Access From',
                    type: 'pie',
                    radius: '50%',
                    data: a,
                    data: [
                        { value: 1048, name: '激战' },
                        { value: 735, name: '篮球场' },
                        { value: 735, name: '足球场' },

                    ],
                    emphasis: {
                        itemStyle: {
                            shadowBlur: 10,
@@ -1210,10 +1006,8 @@
                    type: 'pie',
                    radius: '50%',
                    data: [
                        { value: 1048, name: '0-7岁' },
                        { value: 735, name: '8-10岁' },
                        { value: 735, name: '11-12岁' },
                        { value: 735, name: '13岁以上' },
                        { value: 1048, name: '30-35' },
                        { value: 735, name: '12-18' },

                    ],
                    emphasis: {
@@ -1248,10 +1042,8 @@
                    type: 'pie',
                    radius: '50%',
                    data: [
                        { value: $("#age1").val(), name: '0-7岁' },
                        { value: $("#age2").val(), name: '8-10岁' },
                        { value:$("#age3").val(), name: '11-12岁' },
                        { value: $("#age4").val(), name: '13岁以上' },
                        { value: 1048, name: '30-35' },
                        { value: 735, name: '12-18' },

                    ],
                    emphasis: {
@@ -1322,8 +1114,8 @@
                    type: 'pie',
                    radius: '50%',
                    data: [
                        { value: $("#boy").val(), name: '男' },
                        { value: $("#girl").val(), name: '女' },
                        { value: 1048, name: '男' },
                        { value: 735, name: '女' },

                    ],
                    emphasis: {
@@ -1360,12 +1152,27 @@
        };
        myChart.setOption(option);
    });

    function stuCourseData(){

    }
    $(function(){
        var chartDom = document.getElementById('cookieTeachCourse');
        var myChart = echarts.init(chartDom);
        var option;

        option = {
            xAxis: {
                type: 'category',
                data: ['足球课', '篮球课', '羽毛球课', '网球课', '排球课']
            },
            yAxis: {
                type: 'value'
            },
            series: [
                {
                    data: [120, 200, 150, 80, 70, 110, 130],
                    type: 'bar'
                }
            ]
        };
        myChart.setOption(option);
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html

@@ -66,7 +66,7 @@
                                    @}
                                </select>
                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                <#button name="搜索" icon="fa-search" clickFun="Search()"/>
                                <#button name="搜索" icon="fa-search" clickFun="BatterData()"/>
                            </div>
                            <div class="col-sm-10">
                                <div class="row" id="t1" style="margin-left: 100px;">
@@ -142,61 +142,76 @@
                        </div>
                    </div>
                    <div class="row" id="content3" style="margin-left: 100px;">
                        <div class="col-sm-11">
                            <div class="form-group">
                                <span id="totalNumber3">全球场次总数：</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                            </div>
                        </div>
                        </br>
                        <div class="col-sm-11" style="display: flex">
                            <div class="form-group">
                                <label class="col-sm-3 control-label">*筛选城市：</label>
                                <label class="col-sm-3 control-label">*筛选范围：</label>
                                <div class="col-sm-9">
                                    <select style="width: 200px" class="form-control" id="yearOrMonth3" name="cCode" onchange="getStoreByCity1(this)">
                                    <select style="width: 300px" class="form-control" id="yearOrMonth3" name="cCode" >
                                        <option value="y">年度</option>
                                        <option value="m">月度</option>
                                    </select>
                                </div>
                            </div>
                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                            <div class="form-group" >
                                <label class="col-sm-3 control-label">*筛选内容：</label>
                                <div class="col-sm-9" style="display: flex;">
                                    <input style="width: 200px" class="form-control" id="con3"  placeholder="请输入年份或者月份" type="text">
                                    <input style="width: 300px" class="form-control" id="con3"  placeholder="请输入年份或者月份" type="text">
                                </div>
                            </div>
                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                            <div class="form-group">
                                <label class="col-sm-3 control-label">*筛选城市：</label>
                                <div class="col-sm-9">
                                    <select style="width: 200px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity1(this)">
                                    <select style="width: 300px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity3(this)">
                                        <option value="">全球</option>
                                        @for(obj in list){
                                        <option style="width: 200px" value="${obj.cityCode}">${obj.city}</option>
                                        <option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
                                        @}
                                    </select>
                                </div>
                            </div>
                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                            <div class="form-group" >
                                <label class="col-sm-3 control-label">*筛选场地：</label>
                                <div class="col-sm-9">
                                    <select style="width: 200px" class="form-control" id="site3" name="site">
                                        <option value="">全球</option>
                                        @for(obj in sites){
                                        <option style="width: 200px" value="${obj.id}">${obj.name}</option>
                                        @}
                                    </select>
                                </div>
                        </div>
                        <div class="col-sm-11" style="display: flex">
                        <div class="form-group" >
                            <label class="col-sm-3 control-label">*筛选场地：</label>
                            <div class="col-sm-9">
                                <select style="width: 300px" class="form-control" id="site3" name="site">
                                    <option value="">全球</option>
                                    @for(obj in sites){
                                    <option style="width: 300px" value="${obj.id}">${obj.name}</option>
                                    @}
                                </select>
                            </div>
                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#button name="搜索" icon="fa-search" clickFun="TSite.search3()"/>
                        </div>
                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#button name="搜索" icon="fa-search" clickFun="TSite.search3()"/>
                        </div>
                        <#table id="TSiteTable"/>
                    </div>
                <div class="row" id="content4" style="margin-left: 100px;">
                    <div class="col-sm-11">
                        <div class="form-group">
                            <span id="totalNumber4">全球场次总数：</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                        </div>
                    </div>
                    <div class="col-sm-11" style="display: flex">
                        <div class="form-group">
                            <label class="col-sm-3 control-label">*筛选城市：</label>
                            <label class="col-sm-3 control-label">*筛选范围：</label>
                            <div class="col-sm-9">
                                <select style="width: 200px" class="form-control" id="yearOrMonth4" name="cCode" onchange="getStoreByCity1(this)">
                                <select style="width: 300px" class="form-control" id="yearOrMonth4" name="cCode">
                                    <option value="y">年度</option>
                                    <option value="m">月度</option>
                                </select>
                            </div>
                        </div>
                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                        <div class="form-group" >
                            <label class="col-sm-3 control-label">*筛选内容：</label>
                            <div class="col-sm-9" style="display: flex;">
@@ -207,7 +222,7 @@
                        <div class="form-group">
                            <label class="col-sm-3 control-label">*筛选城市：</label>
                            <div class="col-sm-9">
                                <select style="width: 300px" class="form-control" id="cCode4" name="cCode" onchange="getStoreByCity1(this)">
                                <select style="width: 300px" class="form-control" id="cCode4" name="cCode" onchange="getStoreByCity4(this)">
                                    <option value="">全球</option>
                                    @for(obj in list){
                                    <option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
@@ -216,19 +231,23 @@
                            </div>
                        </div>
                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                        <div class="form-group" >
                            <label class="col-sm-3 control-label">*筛选场地：</label>
                            <div class="col-sm-9">
                                <select style="width: 300px" class="form-control" id="site4" name="site">
                                    <option value="">全球</option>
                                    @for(obj in sites){
                                    <option style="width: 300px" value="${obj.id}">${obj.name}</option>
                                    @}
                                </select>
                            </div>
                        </div>
                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#button name="搜索" icon="fa-search" clickFun="TCompetition.search4()"/>
                    </div>
                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                        <div class="col-sm-11" style="display: flex">
                            <div class="form-group" >
                                <label class="col-sm-3 control-label">*筛选场地：</label>
                                <div class="col-sm-9">
                                    <select style="width: 300px" class="form-control" id="site4" name="site">
                                        <option value="">全球</option>
                                        @for(obj in sites){
                                        <option style="width: 300px" value="${obj.id}">${obj.name}</option>
                                        @}
                                    </select>
                                </div>
                            </div>
                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#button name="搜索" icon="fa-search" clickFun="TSite1.search4()"/>
                        </div>

                    <#table id="TSiteTable1"/>
                </div>
                </div>
@@ -376,8 +395,8 @@
            // 时长
            yT = [];
            mT = [];
            yearX=[];
            for (let i = 0; i <yDataList.length ; i++) {

                yD.push(yDataList[i].total_num);
                yT.push(yDataList[i].batter_time);
            }
@@ -387,6 +406,9 @@
            }
            for (let i = 0; i <resp.yearList.length ; i++) {
                yearX.push(resp.yearList[i])
            }
            if(resp.yearList.length==0){
                yearX=[2019,2020,2021,2023]
            }
            var totalNumber= resp.totalNumber;
            var totalTime= resp.totalTime;
@@ -496,7 +518,12 @@
                    }
                ]
            };
            var myChart4  = echarts.init(document.getElementById('number'));
            myChart4.setOption(option);
            var myChart5  = echarts.init(document.getElementById('time'));
            myChart5.setOption(option2);
        });

        ajax.set("storeId",$("#stores").val());
        ajax.start();
    }
@@ -546,7 +573,18 @@
        BatterData();
        SUTUData();
        Search1();

        // 跨城赛获取全球场次总数
        var ajax = new $ax(Feng.ctxPath + "/gameData/cityGame", function(data){
            var totalNumber3= document.getElementById("totalNumber3");
            totalNumber3.innerText = "全球场次总数:"+data.totalNum;
        });
        ajax.start();
        // 获取90°准度赛全球场次总数
        var ajax4 = new $ax(Feng.ctxPath + "/gameData/cityGameOne", function(data){
            var totalNumber4= document.getElementById("totalNumber4");
            totalNumber4.innerText = "全球场次总数:"+data.totalNum;
        });
        ajax4.start();
        // 基于准备好的dom，初始化echarts实例
        var myChart  = echarts.init(document.getElementById('number'));

@@ -619,7 +657,12 @@
        var cityCode=$(e).val();
        var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
            if(data!=null){
                var content='<option value="">全球</option>';
                if (cityCode==""){
                    var content='<option value="">全球</option>';
                }else{
                    var content='<option value="">全部</option>';
                }

                $.each(data, function(k,v) {
                    content += "<option value='"+v.id+"'>"+v.name+"</option>";
                });
@@ -629,15 +672,37 @@
        ajax.set("oneId",cityCode);
        ajax.start();
    }
    function getStoreByCity1(e) {
    function getStoreByCity3(e) {
        var cityCode=$(e).val();
        var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
            if(data!=null){
                var content='<option value="">全球</option>';
                if (cityCode==""){
                    var content='<option value="">全球</option>';
                }else{
                    var content='<option value="">全部</option>';
                }
                $.each(data, function(k,v) {
                    content += "<option value='"+v.id+"'>"+v.name+"</option>";
                });
                $("#site1").empty().append(content);
                $("#site3").empty().append(content);
            }
        });
        ajax.set("oneId",cityCode);
        ajax.start();
    }
    function getStoreByCity4(e) {
        var cityCode=$(e).val();
        var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
            if(data!=null){
                if (cityCode==""){
                    var content='<option value="">全球</option>';
                }else{
                    var content='<option value="">全部</option>';
                }
                $.each(data, function(k,v) {
                    content += "<option value='"+v.id+"'>"+v.name+"</option>";
                });
                $("#site4").empty().append(content);
            }
        });
        ajax.set("oneId",cityCode);

 cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html

@@ -11,7 +11,7 @@
                        <div class="row">
                        </div>
                <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
                    <h3>场地总人次:</h3>
                    <h3 id="totalNumber">场地总人次:</h3>
                </div>
                <#table id="TSiteTable"/>
            </div>
@@ -27,5 +27,12 @@
        ,range: true
        ,lang:"en"
    });
    $(function(){
        var ajax = new $ax(Feng.ctxPath + "/gateData/totalNum", function(data){
            var totalNumber= document.getElementById("totalNumber");
            totalNumber.innerText = "场地总人次:" + data +"次";
        });
        ajax.start();
    });
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/Operator.html

@@ -39,6 +39,7 @@
                            <#button name="编辑" icon="fa-edit" clickFun="TSite.openInfo()" space="true"/>
                            <#button name="冻结" icon="fa-remove" clickFun="TSite.offShelf()" space="true"/>
                            <#button name="解冻" icon="fa-check" clickFun="TSite.onShelf()" space="true"/>
                            <#button name="分账比例" icon="fa-plus" clickFun="TSite.proportion()"/>
                            <#button name="重置密码" icon="fa-search" clickFun="TSite.reload()" space="true"/>
                        </div>
                        <#table id="TSiteTable"/>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportion.html

New file
@@ -0,0 +1,109 @@
@layout("/common/_container.html"){
<style>
    .avatar-uploader .el-upload {
        border: 1px dashed #d9d9d9;
        border-radius: 6px;
        cursor: pointer;
        position: relative;
        height: 100px;
        width: 100px;
        overflow: hidden;
    }

    .avatar-uploader .el-upload:hover {
        border-color: #409EFF;
    }
    .avatar-uploader-icon {
        font-size: 28px;
        color: #8c939d;
        width: 100px;
        height: 100px;
        line-height: 100px;
        margin-top: 32px;
        text-align: center;
    }
    .avatar {
        width: 100px;
        height: 100px;
        display: block;
    }

    .col-sm-12 {
        margin-top: 20px;
    }

    .col-sm-12 select {
        height: 33px;
    }
    #app1{
        margin-left: 255px;
    }


</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <div class="row">
                <div class="col-lg-6" style="">
                    <input hidden id="operatorIdOne" value="${operatorIdOne}">
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*支付宝分账比例（%）：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="alipayProportion" value="${alipayProportion}"  placeholder="请输入" type="number">
                        </div>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*微信分账比例（%）：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="wechatProportion" value="${wechatProportion}"  placeholder="请输入" type="number">
                        </div>
                    </div>
                </div>
            </div>



            <div class="form-group">
                <div class="row btn-group-m-t">
                    <div class="col-sm-10 col-sm-offset-5" >
                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit1()"/>
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSite.close()"/>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>

<script src="${ctxPath}/modular/system/operator/operator.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
    laydate.render({
        elem: '#tradeTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#IDCardTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#bTime'
        ,range: true
        ,lang:"CN"
    });
    function updateHalf(e) {
        if(e==1){
            $("#benefit").hide()
        }else {
            $("#benefit").show()
        }

    }
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html

New file
@@ -0,0 +1,125 @@
@layout("/common/_container.html"){
<style>
    .avatar-uploader .el-upload {
        border: 1px dashed #d9d9d9;
        border-radius: 6px;
        cursor: pointer;
        position: relative;
        height: 100px;
        width: 100px;
        overflow: hidden;
    }

    .avatar-uploader .el-upload:hover {
        border-color: #409EFF;
    }
    .avatar-uploader-icon {
        font-size: 28px;
        color: #8c939d;
        width: 100px;
        height: 100px;
        line-height: 100px;
        margin-top: 32px;
        text-align: center;
    }
    .avatar {
        width: 100px;
        height: 100px;
        display: block;
    }

    .col-sm-12 {
        margin-top: 20px;
    }

    .col-sm-12 select {
        height: 33px;
    }
    #app1{
        margin-left: 255px;
    }


</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <div class="row">
                <div class="col-lg-6" style="">
                    <input id="operatorId" value="${operatorId}" hidden>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">*支付宝认证类型：</label>
                        <div class="col-sm-9">
                            <input type="radio" name="alipayType" value="1" checked>个人
                            <input type="radio" name="alipayType" value="2" >企业
                        </div>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*支付宝商户号：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="alipayNum"  placeholder="请输入" type="text">
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">*微信认证类型：</label>
                        <div class="col-sm-9">
                            <input type="radio" name="wechatType" value="1" checked>个人
                            <input type="radio" name="wechatType" value="2" >企业
                        </div>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*微信商户号：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="wechatNum"  placeholder="请输入" type="text">
                        </div>
                    </div>

                </div>
            </div>



            <div class="form-group">
                <div class="row btn-group-m-t">
                    <div class="col-sm-10 col-sm-offset-5" >
                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSite.close()"/>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>

<script src="${ctxPath}/modular/system/operator/operator.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
    laydate.render({
        elem: '#tradeTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#IDCardTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#bTime'
        ,range: true
        ,lang:"CN"
    });
    function updateHalf(e) {
        if(e==1){
            $("#benefit").hide()
        }else {
            $("#benefit").show()
        }

    }
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html

@@ -93,8 +93,7 @@
                            </div>
                        </div>
                        <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
                            <#button name="分账比例" icon="fa-plus" clickFun="TSite.openAddTSite()"/>
                            <#button name="认证" icon="fa-plus" clickFun="TSite.openInfo()"/>
                            <#button name="分账比例" icon="fa-plus" clickFun="TSite.proportion()"/>
                        </div>
                        <#table id="TSiteTable"/>
                    </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser_auth.html

File was deleted

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser_proportion.html

New file
@@ -0,0 +1,109 @@
@layout("/common/_container.html"){
<style>
    .avatar-uploader .el-upload {
        border: 1px dashed #d9d9d9;
        border-radius: 6px;
        cursor: pointer;
        position: relative;
        height: 100px;
        width: 100px;
        overflow: hidden;
    }

    .avatar-uploader .el-upload:hover {
        border-color: #409EFF;
    }
    .avatar-uploader-icon {
        font-size: 28px;
        color: #8c939d;
        width: 100px;
        height: 100px;
        line-height: 100px;
        margin-top: 32px;
        text-align: center;
    }
    .avatar {
        width: 100px;
        height: 100px;
        display: block;
    }

    .col-sm-12 {
        margin-top: 20px;
    }

    .col-sm-12 select {
        height: 33px;
    }
    #app1{
        margin-left: 255px;
    }


</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <div class="row">
                <div class="col-lg-6" style="">
                    <input hidden id="operatorIdOne" value="${operatorIdOne}">
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*支付宝分账比例：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="alipayProportion" value="${alipay}"  placeholder="请输入" type="text">
                        </div>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">*微信分账比例：</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="wechatProportion" value="${wechat}"  placeholder="请输入" type="text">
                        </div>
                    </div>
                </div>
            </div>



            <div class="form-group">
                <div class="row btn-group-m-t">
                    <div class="col-sm-10 col-sm-offset-5" >
                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSite.close()"/>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>

<script src="${ctxPath}/modular/system/operatorUser/operatorUser.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
    laydate.render({
        elem: '#tradeTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#IDCardTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#bTime'
        ,range: true
        ,lang:"CN"
    });
    function updateHalf(e) {
        if(e==1){
            $("#benefit").hide()
        }else {
            $("#benefit").show()
        }

    }
</script>
@}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser_proportionAuth.html

New file
@@ -0,0 +1,125 @@
@layout("/common/_container.html"){
<style>
    .avatar-uploader .el-upload {
        border: 1px dashed #d9d9d9;
        border-radius: 6px;
        cursor: pointer;
        position: relative;
        height: 100px;
        width: 100px;
        overflow: hidden;
    }

    .avatar-uploader .el-upload:hover {
        border-color: #409EFF;
    }
    .avatar-uploader-icon {
        font-size: 28px;
        color: #8c939d;
        width: 100px;
        height: 100px;
        line-height: 100px;
        margin-top: 32px;
        text-align: center;
    }
    .avatar {
        width: 100px;
        height: 100px;
        display: block;
    }

    .col-sm-12 {
        margin-top: 20px;
    }

    .col-sm-12 select {
        height: 33px;
    }
    #app1{
        margin-left: 255px;
    }


</style>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <div class="row">
                <div class="col-lg-6" style="">
                    <input id="operatorId" value="${operatorId}" hidden>
                    <div class="form-group">
                        <label class="col-sm-4 control-label" >
                            支付宝认证类型：
                            <input type="radio" name="alipayType" value="1" checked>个人
                            <input type="radio" name="alipayType" value="2" >企业
                        </label>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">支付宝商户号</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="alipayNum"  placeholder="请输入" type="text">
                        </div>
                    </div>

                    <div class="form-group">
                        <label class="col-sm-4 control-label" >
                            微信认证类型：
                            <input type="radio" name="wechatType" value="1" checked>个人
                            <input type="radio" name="wechatType" value="2" >企业
                        </label>
                    </div>
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">微信商户号</label>
                        <div class="col-sm-9">
                            <input style="width: 300px" class="form-control" id="wechatNum"  placeholder="请输入" type="text">
                        </div>
                    </div>

                </div>
            </div>



            <div class="form-group">
                <div class="row btn-group-m-t">
                    <div class="col-sm-10 col-sm-offset-5" >
                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSite.close()"/>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>

<script src="${ctxPath}/modular/system/operatorUser/operatorUser.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
    laydate.render({
        elem: '#tradeTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#IDCardTime'
        ,range: true
        ,lang:"CN"
    });
    laydate.render({
        elem: '#bTime'
        ,range: true
        ,lang:"CN"
    });
    function updateHalf(e) {
        if(e==1){
            $("#benefit").hide()
        }else {
            $("#benefit").show()
        }

    }
</script>
@}

 cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js

@@ -47,7 +47,7 @@
        {field: 'selectItem', checkbox: true},
        {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: '序号', field: 'account_id', visible:true, align: 'center', valign: 'middle'},
        {title: '昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle',},
        {title: '昵称', field: 'name', visible: true, align: 'center', valign: 'middle',},
        {title: '成绩', field: 'score', visible: true, align: 'center', valign: 'middle'},
    ];
};
@@ -73,7 +73,7 @@
    queryData['date'] = $("#con4").val();
    queryData['cityCode'] = $("#cCode4").val();
    queryData['spaceId'] = $("#site4").val();
    TSite.table.refresh({query: queryData});
    TSite1.table.refresh({query: queryData});
};

TSite.resetSearch = function () {
@@ -95,7 +95,7 @@
    TSite.table = table.init();

    var defaultColunms1 = TSite1.initColumn();
    var table1 = new BSTable(TSite1.id, "/gameData/listAll", defaultColunms1);
    var table1 = new BSTable(TSite1.id, "/gameData/listAll1", defaultColunms1);
    table1.setPaginationType("client");
    TSite1.table = table1.init();
});

 cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js

@@ -16,7 +16,7 @@
        {field: 'selectItem', radio: true},
        {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: '场地区域名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
        {title: '入场人次', field: 'number', visible: true, align: 'center', valign: 'middle'}
        {title: '入场人次', field: 'enter_num', visible: true, align: 'center', valign: 'middle'}
    ];
};


 cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js

@@ -34,7 +34,7 @@
            formatter: function (data,row) {
                var btn = "";
                if(data==1) {
                    var str = '<button class="btn btn-outline btn-primary" onclick="TSite.bindOperator('+row.id+')" >去绑定</button>'
                    var str = '<button class="btn btn-outline btn-primary" onclick="TSite.Allocationratio('+row.id+')" >去绑定</button>'
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="" onfocus="TUser.tooltip()">' + str + '</p>']
                }else{
                    var str = '<h3>已绑定</h3>'
@@ -64,18 +64,102 @@
        return true;
    }
};
TSite.bindOperator = function (e) {
    var index = layer.open({
        type: 2,
        title: "认证",
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/operatorUser/proportion/' + e
    });
    this.layerIndex = index;
/**
 * 商户号认证
 */
TSite.Allocationratio = function (e) {
    console.log("看看E");
    console.log(e);
        var index = layer.open({
            type: 2,
            title: "商户认证",
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/operator/proportionAuth/' + e
        });
        this.layerIndex = index;
};
/**
 * 分账比例
 */
TSite.proportion = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length >1 ){
        Feng.info("只能选择一个运营商商户设置分账比例！");
    }else {
        if (this.check()) {
            console.log("看看状态")
            console.log(TSite.seItem.status)
            if (TSite.seItem.status==1){
                Feng.error("当前运营商没有绑定商户号，请先绑定商户号！")
                return;
            }
            var index = layer.open({
                type: 2,
                title: "认证",
                area: ['100%', '100%'], //宽高
                fix: false, //不固定
                maxmin: true,
                content: Feng.ctxPath + '/operator/proportion/' + TSite.seItem.id
            });
            this.layerIndex = index;
        }
    }

};
TSite.addSubmit = function(){
    var alipayType = $("input[name='alipayType']:checked").val();
    var wechatType = $("input[name='wechatType']:checked").val();
    var alipayNum  = $("#alipayNum").val();
    var wechatNum  = $("#wechatNum").val();
    var operatorId  = $("#operatorId").val();
    if($("#alipayNum").val()=='' ){
        Feng.info("请输入支付宝商户号")
        return;
    }
    if($("#wechatNum").val()=='' ){
        Feng.info("请输入微信商户号")
        return;
    }
    var ajax = new $ax(Feng.ctxPath + "/operator/auth", function(data){
        Feng.success("认证成功")
        TSite.close();
        TSite.search();
    });
    ajax.set("alipayType",alipayType);
    ajax.set("wechatType",wechatType);
    ajax.set("alipayNum",alipayNum);
    ajax.set("wechatNum",wechatNum);
    ajax.set("operatorId",operatorId);
    ajax.start();
};
TSite.addSubmit1 = function(){
    var alipayProportion  = $("#alipayProportion").val();
    var wechatProportion  = $("#wechatProportion").val();
    var operatorIdOne  = $("#operatorIdOne").val();
    if($("#alipayNum").val()=='' ){
        Feng.info("请输入支付宝分账比例")
        return;
    }
    if($("#wechatNum").val()=='' ){
        Feng.info("请输入微信分账比例")
        return;
    }
    if (Number(alipayProportion)+Number(wechatProportion)!=100){
        Feng.info("总比例应该是100%,当前比例："+Number(Number(alipayProportion)+Number(wechatProportion)));
        return;
    }
    var ajax = new $ax(Feng.ctxPath + "/operator/proportion", function(data){
        Feng.success("分账比例设置成功")
        TSite.close();
        TSite.search();
    });
    ajax.set("alipayProportion",alipayProportion);
    ajax.set("wechatProportion",wechatProportion);
    ajax.set("operatorIdOne",operatorIdOne);
    ajax.start();
};
/**
 * 上架
 */

 cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js

@@ -48,76 +48,7 @@
        return true;
    }
};
/**
 * 分账比例
 */
TSite.openAddTSite = function () {
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if(selected.length >1 ){
        Feng.info("只能选择一个运营商商户设置分账比例！");
    }else {
        if (this.check()) {
            var index = layer.load(1,{
                type: 1
                , title: '添加分账比例'
                , area: ['50%', '50%']
                , offset: 'auto' //具体配置参考：http://www.layui.com/doc/modules/layer.html#offset
                , id: 'layerDemo' //防止重复弹出cge
                , content: '<div class="form-horizontal">' +
                    '                    <div class="col-sm-11" >' +
                    '                    <div class="col-sm-11">' +
                    '                        <div class="form-group">\n' +
                    '                            <label class="col-sm-3 control-label">支付宝分账比例：</label>\n' +
                    '                         <div class="col-sm-9">\n' +
                    '                                  <input class="form-control" placeholder="请输入分账比例" type="text" id="alipay"> '+
                    '                            </div>\n' +
                    '                        </div>\n' +
                    '                        <div class="form-group">\n' +
                    '                            <label class="col-sm-3 control-label">微信分账比例：</label>\n' +
                    '                         <div class="col-sm-9">\n' +
                    '                                  <input class="form-control" placeholder="请输入分账比例" type="text" id="wechat"> '+
                    '                            </div>\n' +
                    '                        </div>\n' +
                    '                       </div>' +
                    '                   </div>' +
                    '</div>'
                , btn: ['关闭', '保存']
                , btnAlign: 'c' //按钮居中
                , shade:  0.5 //不显示遮罩
                ,load:1
                , yes: function () {
                    layer.closeAll();
                },
                btn2:function () {
                    let wechat = $("#wechat").val()
                    let alipay = $("#alipay").val()
                    if(alipay==''){
                        Feng.info("请输入支付宝分账比例")
                        return false;
                    }
                    if(wechat==''){
                        Feng.info("请输入微信分账比例")
                        return false;
                    }
                    var ajax = new $ax(Feng.ctxPath + "/operatorUser/addProportion", function (data) {
                            Feng.success("设置成功!");
                            window.location.reload();
                            window.parent.layer.closeAll();
                    }, function (data) {
                        Feng.error("操作失败!")
                    });
                    ajax.set("id", TSite.seItem.id);
                    ajax.set("alipay", alipay);
                    ajax.set("wechat", wechat);
                    ajax.start();
                    layer.closeAll();
                }
            });
            this.layerIndex = index;
        }
    }

};
function UploadFileFn(){
    $('#upFile').click();
}