From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
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 3d9f9a1..0347a98 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
@@ -749,7 +749,7 @@
// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
// cityCode = cityManager.getCityCode();
// }
- System.out.println("======="+storeService.queryCity(code, cityCode));
+
// return storeService.queryCity(code, cityCode);
return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
}
@@ -771,6 +771,14 @@
return new ResultUtil(0,null,null,null,null);
}
+
+ @ResponseBody
+ @PostMapping("/queryStore1//{id}")
+ public ResultUtil queryCity6(){
+
+ return new ResultUtil(0,null,null,null,null);
+ }
+
/**
* 根据城市code获取门店
* @param cityCode
@@ -786,9 +794,30 @@
@ResponseBody
- @PostMapping("/queryStore1/{cityCode}")
- public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode){
- List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
+ @PostMapping("/queryStore1/{cityCode}/{$operationId}")
+ public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode,
+ @PathVariable("$operationId") String operationId){
+ Integer operatorId= 0;
+ Integer type= 0;
+ if (operationId.equals("平台")){
+ type = 1;
+ operatorId = null;
+ }else{
+ operatorId = Integer.valueOf(operationId);
+ type = 2;
+ }
+ QueryWrapper<TStore> wrapper = new QueryWrapper<>();
+ wrapper.select("id","name");
+ wrapper.eq("cityCode", cityCode);
+ wrapper.eq("state", 1);
+ wrapper.eq("type", type);
+ if (type!=1){
+ // 如果不是勾选的平台 是选择的运营商 那么筛选运营商id
+ wrapper.eq("operatorId",operatorId);
+ }
+ List<TStore> list = storeService.list(
+ wrapper
+ );
// Map<String,Integer> map = new LinkedHashMap<>();
List<SelectDto> selectDtos = new ArrayList<>();
Map<String,Integer> map = new HashMap<>();
--
Gitblit v1.7.1