d41e0da5df20d559b0b9b8c180d1bf70ba7c1845..08c181231519361f1b7a533d1c7d8b00b776e787
5 天以前 liujie
update
2.0
08c181 对比 | 目录
5 天以前 liujie
update
7a291d 对比 | 目录
1个文件已添加
2个文件已修改
22 ■■■■■ 已修改文件
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/EndWorldCupCallbackDto.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/EndWorldCupCallbackDto.java
New file
@@ -0,0 +1,10 @@
package com.dsh.communityWorldCup.model;
import lombok.Data;
@Data
public class EndWorldCupCallbackDto {
    private String custom;
    private Integer red_score;
    private Integer blue_score;
}
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -236,11 +236,13 @@
            map.put("space_id", tGame.getSiteId() + "");
            map.put("red_sutu_id", tGame.getRed());
            map.put("blue_sutu_id", tGame.getBlue());
            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
//            map.put("api_url", "http://8.137.14.183:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
//            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
            map.put("api_url", "http://8.137.22.229:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
            map.put("custom", jsonObject.toJSONString());
            System.out.println(jsonObject.toJSONString());
            String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
            JSONObject jsonObject1 = JSONObject.parseObject(s);
            Integer code1 = jsonObject1.getInteger("code");
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
@@ -196,9 +196,9 @@
    @PostMapping("/editWorldCup")
    public ResultUtil editWorldCup(WorldCup worldCup, String stores){
        WorldCup worldCup1 = worldCupClient.getWorldCupById(worldCup.getId());
        if(worldCup1.getStartTime().before(DateUtil.getDate())){
            return ResultUtil.error("赛事已开始,不能编辑");
        }
//        if(worldCup1.getStartTime().before(DateUtil.getDate())){
//            return ResultUtil.error("赛事已开始,不能编辑");
//        }
        Integer maxPeople = worldCup1.getMaxPeople();
        int registeredNumber = worldCupClient.getRegisteredNumber(worldCup.getId());
        if(maxPeople.compareTo(registeredNumber) < 0){