From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/CommonApi.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CommonApi.java b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
index baf7a6c..11afc83 100644
--- a/server/web/src/main/java/com/doumee/api/web/CommonApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -3,6 +3,7 @@
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaInfoResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaTreeResponse;
import com.doumee.config.annotation.LoginRequired;
@@ -46,6 +47,9 @@
@Autowired
private ZbomZhongTaiService zbomZhongTaiService;
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
+
@ApiOperation(value = "鑾峰彇鍖哄垝淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getArea")
public ApiResponse<List<ZTAreaInfoResponse>> getArea(@RequestBody ZTAreaListRequest ztAreaListRequest) {
@@ -57,18 +61,23 @@
}
+ @LoginRequired
@ApiOperation(value = "鑾峰彇鍖哄垝鍏ㄩ噺鏍戝舰淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getAreaTree")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<List<ZTAreaTreeResponse>> getAreaTree(@RequestBody ZTAreaListRequest ztAreaListRequest) {
if(StringUtils.isBlank(ztAreaListRequest.getPid())){
ztAreaListRequest.setPid("1");
}
- List<ZTAreaTreeResponse> ztAreaInfoResponses = zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
+ if(StringUtils.isBlank(ztAreaListRequest.getLevel())){
+ ztAreaListRequest.setLevel("5");
+ }
+ ztAreaListRequest.setUserId(getMemberId()+"");
+ ztAreaListRequest.setUserType(ZTConstants.CUSTOMER);
+ List<ZTAreaTreeResponse> ztAreaInfoResponses = getZhongTaiDataService.getZhongTaiAreaTree(ztAreaListRequest);
return ApiResponse.success(ztAreaInfoResponses);
}
-
-
-
-
}
--
Gitblit v1.9.3