From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 1dffb31..3943372 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
@@ -108,7 +108,7 @@
@GetMapping("/getDetailById")
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
- public R<Shop> getDetailById(@RequestParam("id") Long id){
+ public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop byId = shopService.getById(id);
return R.ok(byId);
}
@@ -223,7 +223,7 @@
*/
@GetMapping("/bindShop")
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
- public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
+ public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -299,6 +299,15 @@
ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
return R.ok(shopStatistics);
}
-
+
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/updateShop")
+ public void updateShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ }
}
--
Gitblit v1.7.1