From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index bc3d4db..162e5e6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -1,17 +1,19 @@
package com.ruoyi.shop.controller.console;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
+import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Optional;
/**
* @author jqs34
@@ -27,6 +29,9 @@
@Resource
private ShopService shopService;
+ @Resource
+ private ShopRelUserService shopRelUserService;
+
@PostMapping("/getShop")
public R<Shop> getShop(@RequestBody Long shopId)
@@ -36,4 +41,16 @@
}
+ @GetMapping("/getShopByUserId")
+ public R<ShopRelUserVo> getShopByUserId(Long userId)
+ {
+ ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+ Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到商户信息"));
+ ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
+ shopRelUserVo.setShopId(shopRelUser.getShopId());
+ shopRelUserVo.setUserName(shopRelUser.getUserName());
+ return R.ok(shopRelUserVo);
+ }
+
+
}
--
Gitblit v1.7.1