From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
index a585588..2f09f2a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
@@ -73,7 +73,8 @@
@ApiOperation(value = "联系客服-常见问题列表", tags = {"APP-探索玩湃"})
public ResultUtil<List<QuestionIns>> queryFrequentlyAskedQuestionDetails(){
try {
- return ResultUtil.success(tsService.queryQuestionData());
+ List<QuestionIns> questionIns = tsService.queryQuestionData();
+ return ResultUtil.success(questionIns);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -110,17 +111,18 @@
@PostMapping("/base/exploreWP/storeList")
@ApiOperation(value = "联系客服-门店列表", tags = {"APP-探索玩湃"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "距离数值", name = "space", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "1=升序/2=降序", name = "space", required = true, dataType = "int"),
@ApiImplicitParam(value = "城市code", name = "space", required = true, dataType = "string"),
@ApiImplicitParam(value = "纬度", name = "latitude", required = true, dataType = "string"),
@ApiImplicitParam(value = "经度", name = "longitude", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "搜索", name = "search", required = true, dataType = "string"),
})
- public ResultUtil<List<StoreDetailList>> getStoreListCon(Integer space,String cityCode,String latitude,String longitude){
- try {
- return ResultUtil.success(tsService.queryStoreList(space,cityCode,latitude,longitude));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ public ResultUtil<List<StoreDetailList>> getStoreListCon(Integer space,String cityCode,String latitude,String longitude,String search){
+// try {
+ return ResultUtil.success(tsService.queryStoreList(space,cityCode,longitude,latitude,search));
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1