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

mitao

2025-11-05 aff908fac4b654fd5bffa7b8031b3ff1eb4bf01f

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

@@ -304,11 +304,12 @@
            @ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
            @ApiImplicitParam(value = "日期（2023-01-01）", name = "day", dataType = "string", required = true),
            @ApiImplicitParam(value = "半场名称", name = "halfName", dataType = "string", required = false),
            @ApiImplicitParam(value = "选择场地的名称", name = "siteName", dataType = "string", required = false)
            @ApiImplicitParam(value = "选择场地的名称", name = "siteName", dataType = "string", required = false),
            @ApiImplicitParam(value = "入场方式 1订场 2散客", name = "targetAudience",defaultValue = "1",dataType = "string", required = true),
    })
    public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName) {
    public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName,Integer targetAudience) {
        try {
            List<QuerySiteTimes> list = siteService.querySiteTimes(id, day, halfName, siteName);
            List<QuerySiteTimes> list = siteService.querySiteTimes(id, day, halfName, siteName,targetAudience);
            return ResultUtil.success(list);
        } catch (Exception e) {
            e.printStackTrace();
@@ -366,6 +367,7 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
//            Integer uid = 201;
            return siteService.reservationSite(uid, reservationSite);
        } catch (Exception e) {
            e.printStackTrace();
@@ -633,6 +635,7 @@
            HashMap<String, Object> map = new HashMap<>();
            System.err.println("预约id"+id);
            SiteBooking siteBooking = siteBookingService.getById(id);
            Integer targetAudience = siteBooking.getTargetAudience();
            System.err.println("预约"+siteBooking);
            Integer storeId = siteBooking.getStoreId();
            Store byId1 = service.getById(storeId);
@@ -643,6 +646,12 @@
            map.put("siteType", siteType.getName());
            map.put("shopName", byId1.getName());
            map.put("shopAddress", byId1.getAddress());
            // 进场二维码新增参数codeType 1=订场 2=散客，3=门票,玩湃惠民卡codeType=4
            map.put("codeType", targetAudience);
            map.put("dataId", siteBooking.getId());
//            map.put("siteName", siteBooking.getNextName()==null?"":siteBooking.getNextName());
//            map.put("halfName", siteBooking.getHalfName()==null?"":siteBooking.getHalfName());
            System.err.println("订场类型:"+targetAudience);

            map.put("name", site.getName());