From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 5290264..9dc6cfa 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -30,6 +30,46 @@
     private GDMapGeocodingUtil gdMapGeocodingUtil;
 
 
+    /**
+     * 根据城市管理员id获取门店
+     */
+    @RequestMapping("base/site/getStoreByCityManagerId")
+    public Object getStoreByCityManagerId(@RequestBody Integer id){
+        return storeService.getStoreByCityManagerId(id);
+    }
+    /**
+     * 根据员工id获取门店
+     */
+    @RequestMapping("base/site/getStoreByStoreStaffId")
+    public Object getStoreByStoreStaffId(@RequestBody Integer id){
+        return storeService.getStoreByStoreStaffId(id);
+    }
+
+    /**
+     * 根据门店id获取门店信息
+     */
+    @RequestMapping("base/site/getStoreById")
+    public Store getStoreById(@RequestBody Integer id){
+        return storeService.getOne(new QueryWrapper<Store>().eq("id",id));
+    }
+    /**
+     * 选择市区 展示全部门店
+     */
+    @RequestMapping("base/store/getStore")
+    public List<Store> getStore(@RequestBody String city){
+        return storeService.list(new QueryWrapper<Store>().eq("city",city));
+    }
+
+    /**
+     * 根据所选门店 查询经营时间
+     * @param oneId
+     * @return
+     */
+    @RequestMapping("base/store/getTime")
+    public Store getTime(@RequestBody String oneId){
+        return storeService.getOne(new QueryWrapper<Store>().eq("name",oneId));
+    }
+
 
 
     @PostMapping("/base/protocol/storeDetail/courseOfSto")
@@ -168,7 +208,7 @@
      */
     @ResponseBody
     @PostMapping("/store/queryStoreByIds")
-    public List<Store> queryStoreByIds(List<Integer> ids){
+    public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
         try {
             return storeService.list(new LambdaQueryWrapper<Store>()
                     .in(Store::getId,ids));
@@ -206,7 +246,7 @@
      */
     @ResponseBody
     @PostMapping("/store/queryStoreListByName")
-    public List<Store> queryStoreListByName(@RequestParam("name") String name){
+    public List<Store> queryStoreListByName(@RequestBody String name){
         try {
             List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
             return stores;

--
Gitblit v1.7.1