Skip to content

Commit fbb5a17

Browse files
committed
Revert "Update README"
This reverts commit 3012d96.
1 parent 3012d96 commit fbb5a17

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Content-Type: application/json
250250
返回数据:
251251
- code:返回状态码,0 表示成功,非0 表示失败
252252
- message:返回信息,搜索地点成功或失败的提示信息
253-
- data:返回的数据,搜索成功后返回符合搜索条件的地点列表(注意:如果要列出所有可以将keyword设为空)
253+
- data:返回的数据,搜索成功后返回符合搜索条件的地点列表
254254

255255
返回示例:
256256
```

main.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ func main() {
247247
// 预约地点搜索接口
248248
r.POST("/searchlocation", func(c *gin.Context) {
249249
var request struct {
250-
Token string `json:"token"`
250+
Token string `json:"token"`
251+
Keyword string `json:"keyword"`
251252
}
252253
if err := c.ShouldBindJSON(&request); err != nil {
253254
c.JSON(400, gin.H{"code": 1, "message": "参数错误"})
@@ -260,10 +261,13 @@ func main() {
260261
return
261262
}
262263

263-
records := []Record{}
264-
db.Where("user_id = ?", tokenData.UserID).Find(&records)
265-
c.JSON(200, gin.H{"code": 0, "message": "搜索成功", "data": records})
264+
var locations []Location
265+
if err := db.Where("name LIKE ?", "%"+request.Keyword+"%").Find(&locations).Error; err != nil {
266+
c.JSON(400, gin.H{"code": 1, "message": "搜索失败"})
267+
return
268+
}
266269

270+
c.JSON(200, gin.H{"code": 0, "message": "搜索成功", "data": locations})
267271
})
268272

269273
// 用户预约接口
@@ -278,14 +282,14 @@ func main() {
278282
return
279283
}
280284

281-
var tokenData Token
282-
if err := db.Model(&tokenData).Where("token = ?", request.Token).First(&tokenData).Error; err != nil {
285+
var user User
286+
if err := db.Where("token = ?", request.Token).First(&user).Error; err != nil {
283287
c.JSON(400, gin.H{"code": 1, "message": "身份验证失败"})
284288
return
285289
}
286290

287291
var record Record
288-
record.UserID = tokenData.UserID
292+
record.UserID = user.ID
289293
locationIDUint, err := strconv.ParseUint(request.LocationID, 10, 32)
290294
if err != nil {
291295
// Handle the error if the conversion fails
@@ -312,8 +316,8 @@ func main() {
312316
return
313317
}
314318

315-
var tokenData Token
316-
if err := db.Model(&tokenData).Where("token = ?", request.Token).First(&tokenData).Error; err != nil {
319+
var user User
320+
if err := db.Where("token = ?", request.Token).First(&user).Error; err != nil {
317321
c.JSON(400, gin.H{"code": 1, "message": "身份验证失败"})
318322
return
319323
}

0 commit comments

Comments
 (0)