From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 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 984dd7d..b942e92 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,28 @@
package com.ruoyi.shop.controller.console;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
+import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
+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.shop.service.shop.ShopStaffService;
+import com.ruoyi.shop.service.shop.ShopSuggestService;
+import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
+import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
+import com.ruoyi.system.api.model.QwH5LoginVo;
+import com.ruoyi.system.api.model.QwUserDetailDto;
+import com.ruoyi.system.api.service.RemoteUserService;
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 javax.annotation.Resource;
+import java.util.Optional;
/**
* @author jqs34
@@ -27,7 +38,40 @@
@Resource
private ShopService shopService;
- @InnerAuth
+ @Resource
+ private ShopRelUserService shopRelUserService;
+
+ @Resource
+ private ShopStaffService shopStaffService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Resource
+ private ShopSuggestService shopSuggestService;
+
+
+ /**
+ * 企业微信H5登录
+ * @param qwUserDetail
+ * @return
+ */
+ @PostMapping("/qwH5Login")
+ public R<QwH5LoginVo> qwH5Login(@RequestBody QwUserDetailDto qwUserDetail)
+ {
+ String mobile = qwUserDetail.getMobile();
+ ShopStaff shopStaff = shopStaffService.getByMobile(mobile);
+ Long userId = shopStaff.getUserId();
+ SysUser sysUser = remoteUserService.getSysUser(userId).getData();
+ Optional.ofNullable(sysUser).orElseThrow(() -> new ServiceException("登录失败，未查询到用户"));
+ // 构造登录返回信息
+ QwH5LoginVo qwH5LoginVo = new QwH5LoginVo();
+ qwH5LoginVo.setUserid(qwUserDetail.getUserid());
+ qwH5LoginVo.setMobile(qwUserDetail.getMobile());
+ qwH5LoginVo.setSysUser(sysUser);
+ return R.ok(qwH5LoginVo);
+ }
+
@PostMapping("/getShop")
public R<Shop> getShop(@RequestBody Long shopId)
{
@@ -36,4 +80,49 @@
}
+ @PostMapping("/getShopByUserId")
+ public R<ShopRelUserVo> getShopByUserId(@RequestBody 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);
+ }
+
+ /**
+ * @description 删除商户标签
+ * @author jqs
+ * @date 2023/6/8 15:52
+ * @param tag
+ * @return R
+ */
+ @PostMapping("/deleteShopTag")
+ public R deleteShopTag(@RequestBody String tag)
+ {
+ shopService.deleteShopTag(tag);
+ return R.ok();
+ }
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/9 10:18
+ * @param suggestTag
+ * @return R
+ */
+ @PostMapping("/deleteShopSuggestTag")
+ public R deleteShopSuggestTag(@RequestBody String suggestTag)
+ {
+ shopSuggestService.deleteShopSuggestTag(suggestTag);
+ return R.ok();
+ }
+
+ @PostMapping("/getShopIdByCode")
+ public R<MgtShopIdByCodeVo> getShopIdByCode(@RequestBody MgtShopIdByCodeDto mgtShopIdByCodeDto)
+ {
+ MgtShopIdByCodeVo mgtShopIdByCodeVo = shopService.getShopIdByCode(mgtShopIdByCodeDto);
+ return R.ok(mgtShopIdByCodeVo);
+ }
}
--
Gitblit v1.7.1