From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 8fcd7e0..a04ed24 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -4,6 +4,7 @@
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.account.CityManagerClient;
@@ -19,6 +20,7 @@
import com.dsh.other.model.vo.siteVo.SiteSearchVO;
import com.dsh.other.service.*;
import com.dsh.other.util.PayMoneyUtil;
+import com.dsh.other.util.RedisUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.TokenUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -27,12 +29,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import redis.clients.jedis.Jedis;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -197,7 +201,8 @@
}
}
-
+ @Autowired
+ private RedisUtil redisUtil;
@ResponseBody
@PostMapping("/base/site/querySiteTimes")
@@ -205,8 +210,8 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "日期（2023-01-01）", name = "day", dataType = "string", required = true),
- @ApiImplicitParam(value = "选择场地的名称", name = "day", dataType = "string", required = true),
- @ApiImplicitParam(value = "半场名称", name = "day", dataType = "string", required = false)
+ @ApiImplicitParam(value = "半场名称", name = "halfName", dataType = "string", required = false),
+ @ApiImplicitParam(value = "选择场地的名称", name = "siteName", dataType = "string", required = false)
})
public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day,String halfName,String siteName){
try {
@@ -217,6 +222,22 @@
return ResultUtil.runErr();
}
}
+
+// 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("系统繁忙,请稍后再试！");
+// }
+//
+// }
+
/**
@@ -255,6 +276,22 @@
return ResultUtil.runErr();
}
}
+
+// 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("系统繁忙,请稍后再试！");
+// }
+//
+// }
+
/**
* 购买课程微信支付回调
@@ -356,10 +393,25 @@
SiteBooking byId = siteBookingService.getById(id);
Integer storeId = byId.getStoreId();
Store byId1 = service.getById(storeId);
+ Site site = siteService.getById(byId.getSiteId());
+
+ map.put("siteName",byId1.getName());
+ SiteType siteType = siteTypeService.getById(site.getSiteTypeId());
+ map.put("siteType",siteType.getName());
+ map.put("shopName",byId1.getName());
+ map.put("shopAddress",byId1.getAddress());
+
List<Integer> ids = getIds(byId.getSiteId());
byId.setStorePhone(byId1.getPhone());
+
+ byId.setSid(Arrays.asList(storeId));
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ byId.setRid(collect);
map.put("data",byId);
+
+
map.put("ids",ids);
return ResultUtil.success(map);
}catch (Exception e){
@@ -536,6 +588,14 @@
@Autowired
private IOperatorUserService operatorUserService;
+
+ @ResponseBody
+ @PostMapping("/base/site/game")
+ public List<Map<String, Object>> game(@RequestBody Integer appUserId){
+ return service.game(appUserId);
+
+ }
+
@ResponseBody
@PostMapping("/base/site/queryOperator")
public OperatorUser queryOperator(@RequestBody List<Integer> stores){
--
Gitblit v1.7.1