From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 3d69111..c15d16a 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -30,6 +31,8 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @author jqs34
@@ -78,7 +81,16 @@
@Autowired
private ShopAuthenticationHftxService shopAuthenticationHftxService;
-
+ @PostMapping("/getShopIdsByUserIds")
+ public R<List<Long>> getShopIdsByUserIds(@RequestBody List<Long> userIds)
+ {
+ // 店铺ids
+ List<Long> list = shopService.list(new QueryWrapper<Shop>()
+ .in("belong_user_id", userIds)
+ .eq("del_flag", 0))
+ .stream().map(Shop::getShopId).collect(Collectors.toList());
+ return R.ok(list);
+ }
/**
* 企业微信H5登录
@@ -89,7 +101,13 @@
public R<QwH5LoginVo> qwH5Login(@RequestBody QwUserDetailDto qwUserDetail)
{
String mobile = qwUserDetail.getMobile();
- ShopStaff shopStaff = shopStaffService.getByMobile(mobile);
+ ShopStaff shopStaff = null;
+ if(StringUtils.isNotEmpty(mobile)){
+ shopStaff = shopStaffService.getByMobile(mobile);
+ }else{
+ shopStaff = shopStaffService.getOne(new QueryWrapper<ShopStaff>().eq("del_flag", 0)
+ .eq("user_id", qwUserDetail.getUserid()));
+ }
if(shopStaff==null){
throw new ServiceException(AppErrorConstant.USER_NO_SHOP);
}
@@ -238,11 +256,11 @@
* @date 2023/6/18 16:45
*/
@PostMapping("/boardShopTotal")
- public R<MgtBulletinBoardVo> boardShopTotal()
+ public R<MgtBulletinBoardVo> boardShopTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto)
{
MgtBulletinBoardVo bulletinBoardVo = new MgtBulletinBoardVo();
- MgtBulletinBoardVo bulletinBoardVoShop = shopService.boardShopTotal();
- MgtBulletinBoardVo bulletinBoardVoTask = shopTaskService.boardTaskTotal();
+ MgtBulletinBoardVo bulletinBoardVoShop = shopService.boardShopTotal(boardMemberTotalDto.getUserIds());
+ MgtBulletinBoardVo bulletinBoardVoTask = shopTaskService.boardTaskTotal(boardMemberTotalDto.getUserIds());
bulletinBoardVo.setShopTotal(bulletinBoardVoShop.getShopTotal());
bulletinBoardVo.setDealerTotal(bulletinBoardVoShop.getDealerTotal());
bulletinBoardVo.setAgencyTotal(bulletinBoardVoShop.getAgencyTotal());
@@ -390,4 +408,41 @@
return R.ok(userTaskMsgVoList);
}
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 23:01
+ * @param cityCodes
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listShopByCityCode")
+ public R<List<Shop>> listShopByCityCode(@RequestBody List<String> cityCodes){
+ List<Shop> shopIdList = shopService.listShopByCityCode(cityCodes);
+ return R.ok(shopIdList);
+ }
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 23:01
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listShopByIds")
+ public R<List<Shop>> listShopByIds(@RequestBody List<String> ids){
+ List<Shop> shopIdList = shopService.listByIds(ids);
+ return R.ok(shopIdList);
+ }
+
+
+ /**
+ * 根据管理员id获取门店
+ * @return
+ */
+ @PostMapping("/getShopBySysUserIds")
+ public List<Shop> getShopBySysUserIds(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
+ return shopService.getShopBySysUserIds(boardMemberTotalDto.getUserIds());
+ }
}
--
Gitblit v1.7.1