From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 2 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 3d1b4c7..23dab3a 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
@@ -40,16 +40,18 @@
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -242,6 +244,16 @@
shopFileService.deleteByShopId(shop.getShopId());
shopRelTagService.deleteByShopId(shop.getShopId());
shopRelUserService.deleteByShopId(shop.getShopId());
+ //默认登录账号开关 开启后原默认账号开关关闭
+ List<Long> openIdList = Arrays.stream(mgtEditShopDto.getRelUserOpenIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ if ( !openIdList.isEmpty()) {
+ shopRelUserService.setDefaultCloseByUserIdList(openIdList);
+ }
+
//清空归属
shopStaffService.clearShopStaffRelation(shop.getShopId());
if(!shop.getShopName().equals(mgtEditShopDto.getShopName())){
@@ -305,6 +317,7 @@
handleShopStaff(shop.getShopId(),belongSysUser);
}*/
//商户关联人员
+ String[] openIds = mgtEditShopDto.getRelUserOpenIds().split(",");//开启默认登录账号
if(StringUtils.isNotBlank(relUserIds)){
shopStaffService.clearShopStaffRelation(shop.getShopId());
String[] relUserIdArray = relUserIds.split(",");
@@ -321,6 +334,7 @@
shopRelUser.setUserName(sysUser.getNickName());
shopRelUser.setUserMobile(sysUser.getPhonenumber());
shopRelUser.setUserDeptId(sysUser.getDeptId());
+ shopRelUser.setIsDefault((openIds.length > 0 && Arrays.asList(openIds).contains(str)) ? 1 : 0);
shopRelUserService.save(shopRelUser);
handleShopStaff(shop.getShopId(),sysUser);
}
@@ -656,12 +670,17 @@
if(shopRelUserList!=null&&!shopRelUserList.isEmpty()){
StringJoiner shopUserJs = new StringJoiner(",");
StringJoiner shopUserNameJs = new StringJoiner(",");
+ StringJoiner relUserOpenIds = new StringJoiner(",");
for(ShopRelUser shopRelUser : shopRelUserList){
shopUserJs.add(shopRelUser.getUserId().toString());
shopUserNameJs.add(shopRelUser.getUserName());
+ if (shopRelUser.getIsDefault()==1){
+ relUserOpenIds.add(shopRelUser.getUserId().toString());
+ }
}
mgtShopInfoVo.setRelUserIds(shopUserJs.toString());
mgtShopInfoVo.setRelUsers(shopUserNameJs.toString());
+ mgtShopInfoVo.setRelUserOpenIds(relUserOpenIds.toString());
}
//商户图片
List<ShopFile> shopFileList = shopFileService.listShopFileByShopId(shopId);
@@ -954,7 +973,7 @@
merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
- int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<ShopAppointableTime>().eq(ShopAppointableTime::getShopId, shopId).eq(ShopAppointableTime::getStatus, 1));
+ int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, shopId).eq(TShopAppointableTime::getStatus, 1));
merHomeShopTotalVo.setUnHandleReserve(unHandleReserve);
return merHomeShopTotalVo;
}
@@ -1957,4 +1976,82 @@
public List<Shop> getFranchiseeIdsBYDealerId(Long shopId) {
return shopMapper.getFranchiseeIdsBYDealerId(shopId);
}
+
+ /**
+ * 修改商户类型
+ * @param shopId
+ * @return
+ */
+ @Override
+ public R<Void> changeShopType(Long shopId) {
+ Shop shop = shopMapper.selectById(shopId);
+ if(null == shop|| shop.getDelFlag() != 0){
+ return R.fail("商户不存在");
+ }
+ //商户修改类型 1-经销商 2-加盟商
+ shop.setShopType(shop.getShopType()==1?2:1);
+ if (shop.getShopType()==2){
+ //经销商转加盟商： 先解绑该经销商下所有加盟商
+ shopMapper.setBelongShopIdNull(shopId);
+ }
+ shop.setUpdateUserId(SecurityUtils.getUserId());
+ shopMapper.updateById(shop);
+
+ return R.ok();
+ }
+
+ @Override
+ public Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto) {
+ Page<MgtOneClinkSyncingShopPageVo> page = new Page<>();
+ page.setSize(dto.getPageSize());
+ page.setCurrent(dto.getPageNum());
+ List<MgtOneClinkSyncingShopPageVo> mgtShopPageVoList = shopMapper.getMgtShopPageVoByShopIds(page,dto.getShopIds());
+ return page.setRecords(mgtShopPageVoList);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing) {
+ if (StringUtils.isBlank(oneClinkSyncing.getShopIds())) {
+ return R.fail("请选择要更新的门店");
+ }
+ // 1. 转换门店ID列表
+ List<Long> shopIdList = Arrays.stream(oneClinkSyncing.getShopIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ // 批量删除封面和Banner图
+ shopFileService.deleteBatchByShopIds(shopIdList);
+ //批量添加封面图
+ List<ShopFile> coverUrlList = shopIdList.stream()
+ .map(shopId -> new ShopFile()
+ .setShopId(shopId)
+ .setFileType(1)
+ .setFileUrl(oneClinkSyncing.getCoverUrl())
+ .setDelFlag(0))
+ .collect(Collectors.toList());
+ shopFileService.saveBatch(coverUrlList);
+ //批量添加banner图
+ List<String> bannerUrlList = Arrays.stream(oneClinkSyncing.getDetailsPicture().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.toList());
+ List<ShopFile> bannerList = new ArrayList<>();
+ for (Long shopId : shopIdList) {
+ for (String bannerUrl : bannerUrlList) {
+ bannerList.add(new ShopFile()
+ .setShopId(shopId)
+ .setFileType(2) // Banner图
+ .setFileUrl(bannerUrl)
+ .setDelFlag(0));
+ }
+ }
+ shopFileService.saveBatch(coverUrlList);
+
+ //批量修改门店信息
+ oneClinkSyncing.setShopIdList(shopIdList);
+ shopMapper.updateShopByOneClinkSyncing(oneClinkSyncing);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1