From d22e7172537d9a658e83dbe76bb267c7611642c1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 11 三月 2024 17:02:28 +0800
Subject: [PATCH] bug修改

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   18 ++++++++++++++----
 1 files changed, 14 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..5034ad5 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
@@ -740,8 +740,9 @@
 
 
     @ResponseBody
-    @PostMapping("/queryCity1/{code}")
-    public ResultUtil queryCity1(@PathVariable("code") String code){
+    @PostMapping("/queryCity1/{code}/{$operationId}")
+    public ResultUtil queryCity1(@PathVariable("code") String code,
+                                 @PathVariable("$operationId") String operationId){
         Integer objectType = UserExt.getUser().getObjectType();
         Integer objectId = UserExt.getUser().getObjectId();
         String cityCode = null;
@@ -749,9 +750,18 @@
 //            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
 //            cityCode = cityManager.getCityCode();
 //        }
-        System.out.println("======="+storeService.queryCity(code, cityCode));
+        Integer operatorId= 0;
+        Integer type= 0;
+        if (operationId.equals("平台")){
+            type = 1;
+            operatorId = null;
+        }else{
+            operatorId = Integer.valueOf(operationId);
+            type = 2;
+        }
 //        return storeService.queryCity(code, cityCode);
-        return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
+        return new ResultUtil(0,null,null,storeService.queryCity2(code, cityCode
+        ,type,operatorId),null);
     }
 
     @ResponseBody

--
Gitblit v1.7.1