合并代码

puzhibing

2024-03-08 2a3d0885c11a73d41fb03c985f0032086cd8fa07

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -66,6 +66,15 @@
    private CityManagerClient cityManagerClient;

    /**
     * 通过运营商id查询运营商对应的支付宝商户号
     */
    @RequestMapping("/base/getSMIDByOperatorId")
    @ResponseBody
    public String getSMIDByOperatorId(Integer id) {
        // 获取运营商的管理员
        return siteService.getSMIDByOperatorId(id);
    }
    /**
     * 获取所有场地
     */
    @RequestMapping("/base/site/getList")
@@ -155,14 +164,14 @@
    }

    @RequestMapping("/base/site/listById")
    public Site listById(@RequestParam("id") Integer id) {
    public Site listById(@RequestBody Integer id) {
        Site byId = siteService.getById(id);
        return byId;
    }


    @RequestMapping("/base/site/listBooks")
    public List<SiteBooking> listBooks(@RequestParam("id") Integer id) {
    public List<SiteBooking> listBooks(@RequestBody Integer id) {
        List<SiteBooking> siteId = siteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id));
        return siteId;
    }
@@ -239,20 +248,8 @@
        }
    }

//    public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName) throws Exception {
//
//        if (redisUtil.acquireLock(day,day)) {
//            try {
//                List<QuerySiteTimes> list = siteService.querySiteTimes(id, day,halfName,siteName);
//            return ResultUtil.success(list);
//            } finally {
//                redisUtil.releaseLock(day);
//            }
//        } else {
//            return ResultUtil.error("系统繁忙,请稍后再试！");
//        }
//
//    }




    /**
@@ -340,7 +337,6 @@
        }
    }


    /**
     * 预约场地支付宝回调
     *
@@ -356,7 +352,8 @@
            if (null != map) {
                String code = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
                SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
                SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>()
                        .eq("orderNo", code).eq("state", 1));
                if (siteBooking.getStatus() == 0) {
                    siteBooking.setPayTime(new Date());
                    siteBooking.setStatus(1);
@@ -472,7 +469,7 @@

    @ResponseBody
    @PostMapping("/api/site/queryMySiteById")
    @ApiOperation(value = "获取我的预约场地列表详情2.0", tags = {"用户—预约场地"})
    @ApiOperation(value = "获取我的预约场地列表详情", tags = {"用户—预约场地"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "id", name = "id", dataType = "int", required = true),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),