From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 123 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 44 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 f8993e9..9cafbde 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
@@ -462,7 +462,7 @@
}else{
shop.setCooperativeFlag(0);
}
- shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ shop.setShopStatus(handelShopStatus(null,shop.getCooperativeFlag(), null));
shop.setUpdateTime(new Date());
shop.setUpdateUserId(mgtTerminateCooperationDto.getUserId());
this.saveOrUpdate(shop);
@@ -483,7 +483,7 @@
}else{
shop.setFrozenFlag(0);
}
- shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(), null, null));
this.saveOrUpdate(shop);
}
@@ -496,16 +496,16 @@
*/
private Integer handelShopStatus(Integer frozenFlag, Integer cooperativeFlag, Integer authFlag){
Integer shopStatus = 1;
- if(frozenFlag == 1){
+ if(null != frozenFlag && frozenFlag == 1){
shopStatus = 0;
return shopStatus;
}
- if(authFlag == 0){
- shopStatus = 3;
+ if(null != cooperativeFlag && cooperativeFlag == 0){
+ shopStatus = 2;
return shopStatus;
}
- if(cooperativeFlag == 0){
- shopStatus = 2;
+ if(null != authFlag && authFlag == 0){
+ shopStatus = 3;
return shopStatus;
}
return shopStatus;
@@ -552,12 +552,16 @@
* @return
*/
@Override
- public List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto){
+ public List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto,List<Long> scope){
if (StringUtils.isNotBlank(mgtShopPageDto.getShopTags())) {
mgtShopPageDto.setShopTags(mgtShopPageDto.getShopTags().replace(",", "|"));
}
+ List<Integer> associatedAccount = null;
+ if(StringUtils.isNotEmpty(mgtShopPageDto.getAssociatedAccount())){
+ associatedAccount = Arrays.asList(mgtShopPageDto.getAssociatedAccount().split(",")).stream().map(Integer::valueOf).collect(Collectors.toList());
+ }
// 分页查询商铺信息
- List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto);
+ List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto,scope, associatedAccount);
// 如果查询结果不为空
if (!mgtShopPageVoList.isEmpty()) {
// 创建签约用户ID集合和所属用户ID集合
@@ -599,8 +603,9 @@
shopPageVo.setSignUser(signUserMap.get(shopPageVo.getSignUserId()).getNickName());
}
if (belongUserMap!=null&&!belongUserMap.isEmpty()&&shopPageVo.getBelongUserId() != null) {
- shopPageVo.setBelongUser(belongUserMap.get(shopPageVo.getBelongUserId()).getNickName());
- shopPageVo.setBelongDept(belongUserMap.get(shopPageVo.getBelongUserId()).getDeptName());
+ MgtSysSimpleUserVo mgtSysSimpleUserVo = belongUserMap.get(shopPageVo.getBelongUserId());
+ shopPageVo.setBelongUser(null == mgtSysSimpleUserVo ? "" : mgtSysSimpleUserVo.getNickName());
+ shopPageVo.setBelongDept(null == mgtSysSimpleUserVo ? "" : mgtSysSimpleUserVo.getDeptName());
}
}
}
@@ -905,21 +910,9 @@
}
}
-
-
//分别查询
- StaffHomeShopTotalVo staffHomeShopTotalVo = new StaffHomeShopTotalVo();
- if(userIds!=null&&!userIds.isEmpty()){
- staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
- }else{
- staffHomeShopTotalVo.setShopTotal(0);
- staffHomeShopTotalVo.setAgencyTotal(0);
- staffHomeShopTotalVo.setDealerTotal(0);
- }
- Integer shopTaskCount = 0;
- if(shopIds!=null&&!shopIds.isEmpty()){
- shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
- }
+ StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
+ Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
staffHomeShopTotalVo.setFollowMember(0);
staffHomeShopTotalVo.setNewMember(0);
staffHomeShopTotalVo.setShopTask(shopTaskCount);
@@ -1054,8 +1047,8 @@
* @return List<MgtShopListSimpleVo>
*/
@Override
- public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto){
- return shopMapper.listMgtShopSimpleVo(mgtShopListDto);
+ public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto,List<Long> scope){
+ return shopMapper.listMgtShopSimpleVo(mgtShopListDto,scope);
}
/**
@@ -1092,8 +1085,8 @@
* @date 2023/6/14 23:01
*/
@Override
- public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto){
- return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto);
+ public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto,List<Long> scope){
+ return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto,scope);
}
/**
@@ -1103,8 +1096,9 @@
* @return
*/
@Override
- public List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, MgtShopHFTXAuthPageDto mgtShopAuthPageDto) {
- return shopMapper.pageMgtShopHFTXAuth(page, mgtShopAuthPageDto);
+ public List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, MgtShopHFTXAuthPageDto mgtShopAuthPageDto,
+ List<Long> scope) {
+ return shopMapper.pageMgtShopHFTXAuth(page, mgtShopAuthPageDto,scope);
}
/**
@@ -1115,8 +1109,8 @@
* @date 2023/6/18 16:59
*/
@Override
- public MgtBulletinBoardVo boardShopTotal(){
- MgtBulletinBoardVo mgtBulletinBoardVoShop = shopMapper.shopTotal();
+ public MgtBulletinBoardVo boardShopTotal(List<Long> userIds){
+ MgtBulletinBoardVo mgtBulletinBoardVoShop = shopMapper.shopTotal(userIds);
return mgtBulletinBoardVoShop;
}
@@ -1172,15 +1166,12 @@
shopAuthenticationHftx = new ShopAuthenticationHftx();
shopAuthenticationHftx.setIsDelete(0);
shopAuthenticationHftx.setInsertTime(new Date());
- shopAuthenticationHftx.setAuditStatus("U");
}
String auditStatus = shopAuthenticationHftx.getAuditStatus();
BeanUtils.copyProperties(mgtShopHFTXAuthDto, shopAuthenticationHftx);
shopAuthenticationHftx.setReqSeqId(IdUtils.simpleUUID());
- if(Arrays.asList("N", "F").contains(shopAuthenticationHftx.getAuditStatus())){
- shopAuthenticationHftx.setAuditStatus("");
- shopAuthenticationHftx.setAuditDesc("");
- }
+ shopAuthenticationHftx.setAuditStatus("");
+ shopAuthenticationHftx.setAuditDesc("");
/**
* 开始调起进件接口
*/
@@ -1261,7 +1252,7 @@
userIdList.add(mgtBasePlatformDto.getUserId());
} else {
MgtUserIdByDept mgtUserIdByDept = new MgtUserIdByDept();
- mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getUserId());
+ mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getDeptId());
mgtUserIdByDept = configService.getUserIdByDept(mgtUserIdByDept).getData();
userIdList = mgtUserIdByDept.getUserIdList();
}
@@ -1269,8 +1260,20 @@
mgtBasePlatformDto.setUserIdList(userIdList);
}
}
+ //数据权限
+ List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
+ if(null != userIds){
+ List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
+ if(null != userIdList){
+ userIdList.addAll(userIds);
+ }else{
+ userIdList = userIds;
+ }
+ mgtBasePlatformDto.setUserIdList(userIdList);
+ }
+
//获取基础统计
- MgtPlTotalShopTotalVo plTotalShopTotalVo = shopMapper.getPlTotalShopTotal();
+ MgtPlTotalShopTotalVo plTotalShopTotalVo = shopMapper.getPlTotalShopTotal(userIds);
plTotalShopTotalVo.setSignTotal(0);
List<Long> shopIdList = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
if (!shopIdList.isEmpty()) {
@@ -1517,12 +1520,11 @@
userIdList.add(userId);
}
-
StaffShopSimpleTotalVo shopTotal = shopMapper.getStaffSimpleTotal(1,userIdList);
StaffShopSimpleTotalVo agencyTotal = shopMapper.getStaffSimpleTotal(2,userIdList);
shopTotal.setAgencyTotal(agencyTotal.getShopTotal());
shopTotal.setOpenAgencyTotal(agencyTotal.getOpenShopTotal());
- shopTotal.setCloseAgencyTotal(agencyTotal.getCloseAgencyTotal());
+ shopTotal.setCloseAgencyTotal(agencyTotal.getCloseShopTotal());
return shopTotal;
}
@@ -1725,7 +1727,7 @@
private void applySuccessUpdateShopStatus(Long shopId){
// 更新商户状态为正常
Shop shop = this.getById(shopId);
- Integer shopStatus = handelShopStatus(shop.getFrozenFlag(), shop.getCooperativeFlag(), 1);
+ Integer shopStatus = handelShopStatus(null, null, 1);
LambdaUpdateWrapper<Shop> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(Shop::getShopId, shopId)
.set(Shop::getShopStatus, shopStatus)
@@ -1857,7 +1859,7 @@
ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
if(StringUtils.isNotBlank(result.getAccount())){
shop.setAccountFlag(1);
- shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ shop.setShopStatus(handelShopStatus(null , null,shop.getAuthFlag()));
this.saveOrUpdate(shop);
}
}
@@ -1916,4 +1918,37 @@
Integer pageSize = merchantBasicdataSettlementDto.getPageSize();
return HuiFuTianXiaUtil.getMerchantBasicdataSettlement(IdUtils.simpleUUID(), huifuId, startTime, endTime, pageNum.toString(), pageSize.toString());
}
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 22:53
+ * @param cityCodes
+ * @return List<Long>
+ */
+ @Override
+ public List<Shop> listShopByCityCode(List<String> cityCodes){
+ return shopMapper.listShopByCityCode(cityCodes);
+ }
+
+
+ /**
+ * 根据员工id获取对应的门店
+ * @param userIds
+ * @return
+ */
+ @Override
+ public List<Shop> getShopBySysUserIds(List<Long> userIds) {
+ if(null == userIds || userIds.size() == 0){
+ return new ArrayList<>();
+ }
+ QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>().eq("del_flag", 0).ne("shop_status", -1);
+ if(null != userIds && userIds.size() > 0){
+ queryWrapper.in("belong_user_id", userIds);
+ }
+ List<Shop> list = this.list(queryWrapper);
+ return list;
+ }
}
--
Gitblit v1.7.1