From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 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 c932321..a1502ea 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,10 +1,10 @@
package com.ruoyi.shop.controller.console;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
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;
@@ -15,7 +15,6 @@
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.vo.ShopProportionVo;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.QwH5LoginVo;
@@ -31,7 +30,6 @@
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* @author jqs34
@@ -100,7 +98,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);
}
@@ -167,17 +171,20 @@
@PostMapping("/getShopByUserId")
public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)
{
- ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+ List<ShopRelUser> shopRelUser = shopRelUserService.getByUserId(userId);
Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到用户关联商户"));
ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
- shopRelUserVo.setShopId(shopRelUser.getShopId());
- shopRelUserVo.setUserName(shopRelUser.getUserName());
+ ShopRelUser shopRelUser1 = shopRelUser.stream().filter(s -> s.getIsDefault() == 1).collect(Collectors.toList()).get(0);
+ shopRelUserVo.setShopId(shopRelUser1.getShopId());
+ shopRelUserVo.setUserName(shopRelUser1.getUserName());
+ Shop shop = shopService.getById(shopRelUser1.getShopId());
+ shopRelUserVo.setShopName(shop.getShopName());
+ shopRelUserVo.setShopNum(shopRelUser.size());
return R.ok(shopRelUserVo);
}
-
+
@PostMapping("/getShopByBelongUserId")
- public R<ShopRelUserVo> getShopByBelongUserId(@RequestBody Long userId)
- {
+ public R<ShopRelUserVo> getShopByBelongUserId(@RequestBody Long userId) {
List<Shop> shopList = shopService.getShopByBelongUserId(userId);
Optional.ofNullable(shopList.get(0)).orElseThrow(() -> new ServiceException("未查询到商户信息"));
ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
@@ -249,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());
@@ -428,4 +435,24 @@
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());
+ }
+
+ /**
+ * 根据经销商id查询加盟商ids
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/shop/getFranchiseeIdsBYDealerId")
+ List<Shop> getFranchiseeIdsBYDealerId(@RequestBody Long shopId){
+ return shopService.getFranchiseeIdsBYDealerId(shopId);
+ }
}
--
Gitblit v1.7.1