BUG联调

jiangqs

2023-06-27 1ffb6c7910cfb4d55b4c169142b67ea872fcf614

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -796,45 +796,20 @@
        //获取商户类型
        List<MgtMapTotalVo> shopTypeTotal = shopMapper.listShopTypeTotal(mgtBasePlatformDto);
        if (shopTypeTotal != null && shopTypeTotal.size() > 0) {
            String[] shopTypeKey = new String[shopTypeTotal.size()];
            Integer[] shopTypeValue = new Integer[shopTypeTotal.size()];
            // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
            for (int i = 0; i < shopTypeTotal.size(); i++) {
                if (shopTypeTotal.get(i).getMapKey().equals("1")) {
                    shopTypeKey[i] = "经销商";
                } else if (shopTypeTotal.get(i).getMapKey().equals("2")) {
                    shopTypeKey[i] = "代理商";
                }
                shopTypeValue[i] = shopTypeTotal.get(i).getMapValue();
            }
            plTotalShopTotalVo.setShopTypeKey(shopTypeKey);
            plTotalShopTotalVo.setShopTypeValue(shopTypeValue);
            shopTypeTotal = listRemoveNull(shopTypeTotal);
            plTotalShopTotalVo.setShopTypeVos(shopTypeTotal);
        }
        //获取商户状态
        List<MgtMapTotalVo> shopStatusTotal = shopMapper.listShopStatusTotal(mgtBasePlatformDto);
        if (shopStatusTotal != null && shopStatusTotal.size() > 0) {
            String[] shopStatusKey = new String[shopStatusTotal.size()];
            Integer[] shopStatusValue = new Integer[shopStatusTotal.size()];
            // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
            for (int i = 0; i < shopStatusTotal.size(); i++) {
                shopStatusKey[i] = shopStatusTotal.get(i).getMapKey();
                shopStatusValue[i] = shopStatusTotal.get(i).getMapValue();
            }
            plTotalShopTotalVo.setShopStatusKey(shopStatusKey);
            plTotalShopTotalVo.setShopStatusValue(shopStatusValue);
            shopStatusTotal = listRemoveNull(shopStatusTotal);
            plTotalShopTotalVo.setShopStatusVos(shopStatusTotal);
        }
        //获取区域排名
        List<MgtMapTotalVo> shopAreaRank = shopMapper.listShopAreaRank(mgtBasePlatformDto);
        if (shopAreaRank != null && shopAreaRank.size() > 0) {
            String[] shopRankKey = new String[shopAreaRank.size()];
            Integer[] shopRankValue = new Integer[shopAreaRank.size()];
            // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
            for (int i = 0; i < shopAreaRank.size(); i++) {
                shopRankKey[i] = shopAreaRank.get(i).getMapKey();
                shopRankValue[i] = shopAreaRank.get(i).getMapValue();
            }
            plTotalShopTotalVo.setAreaRankKey(shopRankKey);
            plTotalShopTotalVo.setAreaRankValue(shopRankValue);
            shopAreaRank = listRemoveNull(shopAreaRank);
            plTotalShopTotalVo.setAreaRankVos(shopAreaRank);
        }
        //获取销售排名
        List<MgtMapTotalVo> shopSalesRank = shopMapper.listShopSalesRank(mgtBasePlatformDto);
@@ -852,20 +827,29 @@
        //获取推荐
        List<MgtMapTotalVo> shopRecommendRank = shopMapper.listShopRecommendRank(mgtBasePlatformDto);
        if (shopRecommendRank != null && shopRecommendRank.size() > 0) {
            String[] shopRecommendKey = new String[shopRecommendRank.size()];
            Integer[] shopRecommendValue = new Integer[shopRecommendRank.size()];
            // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
            for (int i = 0; i < shopRecommendRank.size(); i++) {
                shopRecommendKey[i] = shopRecommendRank.get(i).getMapKey();
                shopRecommendValue[i] = shopRecommendRank.get(i).getMapValue();
            }
            plTotalShopTotalVo.setShopRecommendKey(shopRecommendKey);
            plTotalShopTotalVo.setShopRecommendValue(shopRecommendValue);
            shopRecommendRank = listRemoveNull(shopRecommendRank);
            plTotalShopTotalVo.setShopRecommendVos(shopRecommendRank);
        }
        return plTotalShopTotalVo;
    }

    /**
     * @description  去除空字符串
     * @author  jqs
     * @date    2023/6/27 17:35
     * @param mgtMapTotalVos
     * @return  List<MgtMapTotalVo>
     */
    private List<MgtMapTotalVo> listRemoveNull(List<MgtMapTotalVo> mgtMapTotalVos){
        for (int i = 0; i < mgtMapTotalVos.size(); i++) {
            if(StringUtils.isBlank(mgtMapTotalVos.get(i).getMapKey())){
                mgtMapTotalVos.remove(i);
            }
        }
        return mgtMapTotalVos;
    }

    /**
     * @description 获取平台统计shopId
     * @param mgtBasePlatformDto
     * @return List<Long>