From 57f0ac728903401fd0123ee300eb178bb569a08e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 三月 2024 14:44:11 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java |   57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 13 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 171dea4..2fae959 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;
@@ -1106,8 +1106,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;
     }
 
@@ -1249,7 +1249,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();
             }
@@ -1257,8 +1257,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()) {
@@ -1712,7 +1724,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)
@@ -1844,7 +1856,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);
                 }
             }
@@ -1917,4 +1929,23 @@
     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