From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 763c21e..dfe1539 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.shop.ShopTotal;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
import com.ruoyi.shop.domain.vo.*;
@@ -155,13 +154,24 @@
String[] relUserIdArray = relUserIds.split(",");
ShopRelUser shopRelUser;
Long userId;
- for (String str : relUserIdArray) {
- userId = Long.valueOf(str);
- shopRelUser = shopRelUserService.getByUserId(userId);
- if(shopRelUser!=null){
- throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+ if(mgtEditShopDto.getShopId()!=null){
+ for (String str : relUserIdArray) {
+ userId = Long.valueOf(str);
+ shopRelUser = shopRelUserService.getByUserId(userId);
+ if(shopRelUser!=null&&!shopRelUser.getShopId().equals(mgtEditShopDto.getShopId())){
+ throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+ }
+ }
+ }else {
+ for (String str : relUserIdArray) {
+ userId = Long.valueOf(str);
+ shopRelUser = shopRelUserService.getByUserId(userId);
+ if(shopRelUser!=null){
+ throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+ }
}
}
+
}
//验证商户名唯一
Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
@@ -949,4 +959,40 @@
mgtShopAuthCodeVo.setLegalValidationUrl(shopAuthentication.getLegalValidationUrl());
return mgtShopAuthCodeVo;
}
+
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 17:27
+ * @param shopId
+ * @return List<Long>
+ */
+ @Override
+ public List<Long> listShopIdByShopId(Long shopId){
+ List<Long> shopIds = shopMapper.selectList(
+ new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getBelongShopId, shopId)
+ ).stream().map(Shop::getShopId).collect(Collectors.toList());
+ return shopIds;
+ }
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 18:18
+ * @param shopId
+ * @return List<MgtSimpleShopVo>
+ */
+ @Override
+ public List<MgtSimpleShopVo> listShopByShop(Long shopId){
+ List<MgtSimpleShopVo> simpleShopVoList = shopMapper.selectList(
+ new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getBelongShopId, shopId)).
+ stream().map(shop->{
+ MgtSimpleShopVo simpleShopVo = new MgtSimpleShopVo();
+ simpleShopVo.setShopId(shop.getShopId());
+ simpleShopVo.setShopName(shop.getShopName());
+ return simpleShopVo;
+ }).collect(Collectors.toList());
+ return simpleShopVoList;
+ }
}
--
Gitblit v1.7.1