From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 5159c40..130409a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -6,8 +6,10 @@
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.Technician;
 import com.ruoyi.other.enums.ShopStatus;
 import com.ruoyi.other.service.ShopService;
 import com.ruoyi.other.service.TechnicianService;
@@ -114,5 +116,31 @@
         // todo 待完善 pu
         return R.ok();
     }
+    
+    
+    /**
+     * 根据id获取门店信息
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getShopById")
+    public R<Shop> getShopById(@RequestParam("id") Integer id){
+        Shop shop = shopService.getById(id);
+        return R.ok(shop);
+    }
+    
+    
+    /**
+     * 根据店铺管理员电话获取门店数据
+     * @param phone
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getShopByPhone")
+    public R<Shop> getShopByPhone(@RequestParam("phone") String phone){
+        Shop one = shopService.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getPhone, phone).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+        return R.ok(one);
+    }
 }
 

--
Gitblit v1.7.1