From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 09:34:49 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
index 5cd3c8f..d3e7d91 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
@@ -4,6 +4,8 @@
import com.ruoyi.admin.entity.Region;
import com.ruoyi.admin.service.RegionService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +13,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -28,14 +31,44 @@
@Resource
private RegionService regionService;
+ @Resource
+ private TokenService tokenService;
/**
* 收货地址省市二级联动
*/
@GetMapping("/addressTree")
- @ApiOperation(value = "收货地址省市二级联动", tags = {"后台-首页"})
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
public R<List<Region>> addressTree() {
- return R.ok(regionService.addressTree());
+// LoginUser loginUser = tokenService.getLoginUser();
+// if (null == loginUser) {
+// return R.loginExpire("登录失效！");
+// }
+// List<String> cityCodeList;
+// if (loginUser.getIsFranchisee()) {
+// cityCodeList = loginUser.getCityList();
+// } else {
+// cityCodeList = new ArrayList<>();
+// }
+ return R.ok(regionService.addressTree(null));
}
+ @GetMapping("/manageaddressTree")
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
+ public R<List<Region>> manageaddressTree() {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ List<String> cityCodeList;
+ if (loginUser.getIsFranchisee()) {
+ cityCodeList = loginUser.getCityList();
+ } else {
+ cityCodeList = new ArrayList<>();
+ }
+ return R.ok(regionService.addressTree1(cityCodeList));
+ }
+
+
+
}
--
Gitblit v1.7.1