From 797b148b48d6fd1a584c0a2b639cd6f0fef81411 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:33:34 +0800
Subject: [PATCH] 权限添加
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 20 ++++++++++----------
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 3 ++-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 9af0f39..970f217 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -197,7 +197,8 @@
@PostMapping("/base/pointMerchars/getCommoditys")
public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
if (request.getShopId()!=null){
- CoursePackage coursePackage = coursePackageClient.queryByStoreId(request.getShopId());
+ List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 5a3359d..5163673 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.CityManagerClient;
@@ -14,12 +15,12 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.util.ToolUtil;
+import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TOperator;
import com.dsh.guns.modular.system.model.TSite;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.dto.SelectDto;
-import com.dsh.guns.modular.system.service.ICoursePackageService;
-import com.dsh.guns.modular.system.service.IStoreService;
-import com.dsh.guns.modular.system.service.ITSiteService;
+import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
import org.aspectj.weaver.ast.Var;
@@ -70,7 +71,8 @@
@Resource
private CoursePackageClient coursePackageClient;
-
+ @Autowired
+ private ICityService cityService;
@@ -100,18 +102,16 @@
* @param model
* @return
*/
+ @Autowired
+ private TOperatorService operatorService;
@GetMapping("/openCoursePackageListPage")
public String openCoursePackageListPage(Model model){
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType();
model.addAttribute("coursePackageType", tCoursePackageTypes);
- String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
+
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("province", list);
model.addAttribute("objectType", objectType);
return PREFIX + "coursePackage.html";
--
Gitblit v1.7.1