协销服务商合并

src/main/java/com/caimei365/user/controller/ShopApi.java

@@ -45,6 +45,7 @@ public class ShopApi {
 //        }
 //        return shopService.shortcutLogin(userId);
 //    }
+
     /**
      * 根据用户Id查询供应商资料
      * <p>
@@ -113,21 +114,23 @@ public class ShopApi {
 
     /**
      * 供应商首页数据
+     *
      * @param shopId 供应商Id
      */
     @ApiOperation("供应商首页数据(旧：/supplier/home/detail(supplierId))")
     @ApiImplicitParam(required = true, name = "shopId", value = "供应商Id")
     @GetMapping("/home/data")
-    @IpSave(saveName = "供应商首页数据",saveParams = true)
-    public ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId) {
+    @IpSave(saveName = "供应商首页数据", saveParams = true)
+    public ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId, Integer userId, Integer userIdentity) {
         if (null == shopId) {
             return ResponseJson.error("参数异常：供应商Id不能为空！", null);
         }
-        return shopService.getShopHomeData(shopId);
+        return shopService.getShopHomeData(shopId, userId, userIdentity);
     }
 
     /**
      * 供应商主页列表配置列表
+     *
      * @param shopId
      * @param category
      * @param pageNum
@@ -147,6 +150,7 @@ public class ShopApi {
 
     /**
      * 一键排序
+     *
      * @param id
      * @param sort
      * @return
@@ -165,6 +169,7 @@ public class ShopApi {
 
     /**
      * 供应商商品类别回显
+     *
      * @param id
      * @return
      */
@@ -179,6 +184,7 @@ public class ShopApi {
 
     /**
      * 选择商品
+     *
      * @param shopId
      * @param categoryId
      * @param name
@@ -192,13 +198,14 @@ public class ShopApi {
                                                                         @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == shopId) {
-            return  ResponseJson.error(-1, "供应商Id不能为空", null);
+            return ResponseJson.error(-1, "供应商Id不能为空", null);
         }
-         return shopService.getShopProductList(shopId, categoryId, name, pageNum, pageSize);
+        return shopService.getShopProductList(shopId, categoryId, name, pageNum, pageSize);
     }
 
     /**
      * 保存供应商类别
+     *
      * @param jsonParamsDto
      * @return
      */
@@ -216,6 +223,7 @@ public class ShopApi {
 
     /**
      * 删除供应商商品类别
+     *
      * @param id
      * @return
      */
@@ -230,6 +238,7 @@ public class ShopApi {
 
     /**
      * 供应商首页-轮播图片
+     *
      * @param shopId 供应商Id
      */
     @ApiOperation("供应商首页-轮播图片(旧：/supplier/home/images(supplierId))")
@@ -245,6 +254,7 @@ public class ShopApi {
 
     /**
      * 供应商banner 排序
+     *
      * @param id
      * @param sort
      * @return
@@ -263,6 +273,7 @@ public class ShopApi {
 
     /**
      * 供应商-更新轮播图片
+     *
      * @param shopBannerDto {
      *                      id      图片id
      *                      shopId  供应商Id
@@ -270,7 +281,7 @@ public class ShopApi {
      *                      title   名称
      *                      link    链接
      *                      info    描述
-     * }
+     *                      }
      */
     @ApiOperation("供应商-更新轮播图片(旧：/supplier/saveShopBanner)")
     @PostMapping("/home/images/update")
@@ -280,6 +291,7 @@ public class ShopApi {
 
     /**
      * 供应商-删除轮播图片
+     *
      * @param shopBannerDto { id  图片id}
      */
     @ApiOperation("供应商-删除轮播图片(旧：/supplier/deleteShopBanner)")
@@ -293,6 +305,7 @@ public class ShopApi {
 
     /**
      * 供应商个人中心数据
+     *
      * @param userId 用户Id
      */
     @ApiOperation("供应商个人中心数据(旧：/supplier/homePageData)")
@@ -309,9 +322,9 @@ public class ShopApi {
     }
 
     @ApiOperation("供应商文章表单")
-    @ApiImplicitParam(required = true, name = "articleId",value = "文章id")
+    @ApiImplicitParam(required = true, name = "articleId", value = "文章id")
     @GetMapping("/article/form")
-    public ResponseJson<Map<String,Object>> shopArticleForm(Integer articleId) {
+    public ResponseJson<Map<String, Object>> shopArticleForm(Integer articleId) {
         return shopService.getShopArticleById(articleId);
     }
 
@@ -337,18 +350,18 @@ public class ShopApi {
 
     @ApiOperation("文章分类列表")
     @GetMapping("/article/type/list")
-    public ResponseJson<List<ArticleTypeVo>> getArticleTypeList(){
+    public ResponseJson<List<ArticleTypeVo>> getArticleTypeList() {
         return shopService.getArticleTypeList();
     }
 
     @ApiOperation("删除文章")
     @PostMapping("/article/delete")
-    public ResponseJson<Void> deleteArticle(Integer articleId){
+    public ResponseJson<Void> deleteArticle(Integer articleId) {
         return shopService.deleteArticle(articleId);
     }
 
     @ApiOperation("供应商百科商品表单")
-    @ApiImplicitParam(required = true, name = "productId",value = "百科商品id")
+    @ApiImplicitParam(required = true, name = "productId", value = "百科商品id")
     @GetMapping("/baike/product/form")
     public ResponseJson<BaikeProductFormVo> baikeProductForm(Integer productId) {
         return shopService.getBaikeProductById(productId);
@@ -363,8 +376,8 @@ public class ShopApi {
     @ApiOperation("供应商百科商品列表")
     @GetMapping("/baike/product/list")
     public ResponseJson<PageInfo<BaikeProductListVo>> getBaikeProductList(BaikeProductDto baikeProductDto,
-                                                                      @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                      @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+                                                                          @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                          @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return shopService.getBaikeProductList(baikeProductDto, pageNum, pageSize);
     }
 
@@ -375,23 +388,23 @@ public class ShopApi {
     }
 
     @ApiOperation("百科商品分类列表")
-    @ApiImplicitParam(required = true, name = "commodityType",value = "百科分类：1产品，2仪器")
+    @ApiImplicitParam(required = true, name = "commodityType", value = "百科分类：1产品，2仪器")
     @GetMapping("/baike/product/type/list")
-    public ResponseJson<List<BaikeProductTypeVo>> getBaikeProductTypeList(Integer commodityType){
+    public ResponseJson<List<BaikeProductTypeVo>> getBaikeProductTypeList(Integer commodityType) {
         return shopService.getBaikeProductTypeList(commodityType);
     }
 
     @ApiOperation("删除百科商品")
-    @ApiImplicitParam(required = true, name = "productId",value = "百科商品id")
+    @ApiImplicitParam(required = true, name = "productId", value = "百科商品id")
     @PostMapping("/baike/product/delete")
-    public ResponseJson<Void> deleteBaikeProduct(Integer productId){
+    public ResponseJson<Void> deleteBaikeProduct(Integer productId) {
         return shopService.deleteBaikeProduct(productId);
     }
 
     @ApiOperation("查询敏感词")
     @ApiImplicitParam(required = true, name = "checkPoint", value = "检查位置：1供应商端文章，2供应商端百科，3管理员端文章，4管理员端百科")
     @GetMapping("/sensitive/words")
-    public ResponseJson<String> getSensitiveWords(Integer checkPoint){
+    public ResponseJson<String> getSensitiveWords(Integer checkPoint) {
         if (null == checkPoint) {
             return ResponseJson.error("参数异常", null);
         }
@@ -401,7 +414,7 @@ public class ShopApi {
     @ApiOperation("百科相关推荐表单")
     @ApiImplicitParam(required = true, name = "productId", value = "百科产品id")
     @GetMapping("/baike/recommend/form")
-    public ResponseJson<Map<String,Object>> baikeRecommendForm(Integer productId){
+    public ResponseJson<Map<String, Object>> baikeRecommendForm(Integer productId) {
         return shopService.getBaikeRecommendForm(productId);
     }
 
@@ -415,8 +428,8 @@ public class ShopApi {
     })
     @GetMapping("/baike/recommend/add/list")
     public ResponseJson<PageInfo<BaikeProductListVo>> addRecommendList(Integer productId, Integer typeId, String name,
-                                                                     @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                     @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
+                                                                       @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                       @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == productId) {
             return ResponseJson.error("百科产品id不能为空", null);
         }
@@ -428,7 +441,7 @@ public class ShopApi {
 
     @ApiOperation("百科相关推荐添加产品")
     @PostMapping("/baike/recommend/add")
-    public ResponseJson<Void> addBaikeRecommend(BaikeProductDto baikeProduct){
+    public ResponseJson<Void> addBaikeRecommend(BaikeProductDto baikeProduct) {
         if (null == baikeProduct.getProductId()) {
             return ResponseJson.error("商品id不能为空", null);
         }
@@ -438,7 +451,7 @@ public class ShopApi {
     @ApiOperation("百科相关推荐删除产品")
     @ApiImplicitParam(required = true, name = "recommendId", value = "相关推荐id")
     @PostMapping("/baike/recommend/delete")
-    public ResponseJson<Void> deleteBaikeRecommend(Integer recommendId){
+    public ResponseJson<Void> deleteBaikeRecommend(Integer recommendId) {
         if (null == recommendId) {
             return ResponseJson.error("相关推荐id不能为空", null);
         }
@@ -447,7 +460,7 @@ public class ShopApi {
 
     @ApiOperation("百科相关推荐更改排序")
     @PostMapping("/baike/recommend/sort/save")
-    public ResponseJson<Void> saveRecommendSort(BaikeRecommendVo baikeRecommend){
+    public ResponseJson<Void> saveRecommendSort(BaikeRecommendVo baikeRecommend) {
         if (null == baikeRecommend.getRecommendId()) {
             return ResponseJson.error("相关推荐id不能为空", null);
         }
@@ -459,7 +472,7 @@ public class ShopApi {
 
     @ApiOperation("百科相关推荐更改推荐方式")
     @PostMapping("/baike/recommend/type/save")
-    public ResponseJson<Void> saveRecommendType(BaikeProductDto baikeProduct){
+    public ResponseJson<Void> saveRecommendType(BaikeProductDto baikeProduct) {
         if (null == baikeProduct.getProductId()) {
             return ResponseJson.error("商品id不能为空", null);
         }
@@ -471,6 +484,7 @@ public class ShopApi {
 
     /**
      * 供应商营销数据看板
+     *
      * @param type
      * @param marketReportId
      * @param shopId

src/main/java/com/caimei365/user/mapper/ShopMapper.java

@@ -363,4 +363,6 @@ public interface ShopMapper {
      * @return
      */
     List<String> getMarketReportDataList(@Param("shopId") Integer shopId);
+
+    Integer findSpId(Integer userId);
 }

src/main/java/com/caimei365/user/model/po/ServiceProviderPo.java

@@ -66,25 +66,6 @@ public class ServiceProviderPo implements Serializable {
      * 联系人职务
      */
     private String duty;
-    /**
-     * 审核状态
-     */
-    private String auditStatus;
-
-    /**
-     * 审核时间
-     */
-    private String auditTime;
-
-    /**
-     * 审核信息
-     */
-    private String auditNote;
-    /**
-     * 是否可用 1可用
-     */
-    private String validFlag;
-
     /**
      * 头像
      */
@@ -99,9 +80,4 @@ public class ServiceProviderPo implements Serializable {
      * 创建时间
      */
     private String addTime;
-    /**
-     * 创客经理Id
-     */
-    private Integer mainServiceProviderId;
-
 }

src/main/java/com/caimei365/user/service/ShopService.java

@@ -76,7 +76,7 @@ public interface ShopService {
      * 供应商首页数据
      * @param shopId 供应商Id
      */
-    ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId);
+    ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId,Integer userId,Integer userIdentity);
 
     /**
      * 供应商主页列表配置列表

src/main/java/com/caimei365/user/service/impl/ShopServiceImpl.java

@@ -99,7 +99,7 @@ public class ShopServiceImpl implements ShopService {
                 // 供应商商品上架平台信息
                 List<String> shopProductList = loginMapper.getShopProductGroudMall(userLoginVo.getShopId());
                 if (null != shopProductList) {
-                    for(String product : shopProductList ) {
+                    for (String product : shopProductList) {
                         if (StringUtils.isNotBlank(product)) {
                             // 商品上架平台是否在联合丽格上架
                             if (product.contains("4")) {
@@ -304,7 +304,32 @@ public class ShopServiceImpl implements ShopService {
      * @param shopId 供应商Id
      */
     @Override
-    public ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId) {
+    public ResponseJson<ShopHomeVo> getShopHomeData(Integer shopId, Integer userId, Integer userIdentity) {
+        /** 薇旖美特殊需求，非福建服务商名下的机构无法查看其主页
+         *  1.供应商自己可以看
+         *  2.薇旖美服务商+名下协销和机构
+         */
+//        if (shopId == 10131) {
+//            boolean b = true;
+//            // 协销
+//            if (1 == userIdentity) {
+//
+//            }
+//            // 供应商
+//            else if (3 == userIdentity) {
+//                b = 22965 != userId;
+//            }
+//            // 机构
+//            else if (2 == userIdentity || 4 == userIdentity) {
+//                // 根据服务商（协销组长userId）查询名下小组内协销匹配机构
+//                Integer spId = shopMapper.findSpId(userId);
+//                spId = null == spId ? 0 : spId;
+//
+//            }
+//            if(b){
+//                return ResponseJson.error(-2, "无权限");
+//            }
+//        }
         ShopHomeVo supplier = shopMapper.getShopHomeData(shopId);
         if (supplier != null && supplier.getBusinessScope() != null) {
             String[] businessScope = supplier.getBusinessScope().split("/");
@@ -375,7 +400,7 @@ public class ShopServiceImpl implements ShopService {
         CmShopCategoryVo shopCategoryById = shopMapper.getShopCategoryById(id);
         List<ProductItemVo> categoryProductList = shopMapper.getCategoryProductById(id);
         categoryProductList.forEach(product -> {
-            product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0 , wwwDomain));
+            product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, wwwDomain));
         });
         shopCategoryById.setProducts(categoryProductList);
         return ResponseJson.success(shopCategoryById);
@@ -396,12 +421,12 @@ public class ShopServiceImpl implements ShopService {
         PageHelper.startPage(pageNum, pageSize);
         List<ProductItemVo> shopProductList = shopMapper.getShopProductList(shopId, name);
         // 供应商已选择商品, 同类别不可重复选择
-        List<Integer> categoryProductIdList =  new ArrayList<>();
+        List<Integer> categoryProductIdList = new ArrayList<>();
         if (null != categoryId) {
             categoryProductIdList = shopMapper.getCategoryProductIdList(shopId, categoryId);
         }
         for (ProductItemVo product : shopProductList) {
-            product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0 , wwwDomain));
+            product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, wwwDomain));
             if (null != categoryProductIdList && categoryProductIdList.contains(product.getProductId())) {
                 product.setFlag(false);
             } else {
@@ -446,7 +471,7 @@ public class ShopServiceImpl implements ShopService {
             cmShopCategoryVo.setCategory(category);
             cmShopCategoryVo.setSort(sort);
             cmShopCategoryVo.setProductIds(productIds);
-            if(null == id) {
+            if (null == id) {
                 // 新增
                 shopMapper.insertCategory(cmShopCategoryVo);
             } else {
@@ -477,7 +502,7 @@ public class ShopServiceImpl implements ShopService {
                     }
                 }
                 // 排除不在该商品类别的商品
-                if(productIdList.size() > 0) {
+                if (productIdList.size() > 0) {
                     shopMapper.updateCategoryProduct(categoryId, productIdList);
                 }
             }
@@ -503,7 +528,7 @@ public class ShopServiceImpl implements ShopService {
      * 供应商首页-轮播图片
      *
      * @param shopId 供应商Id
-     * @param title 标题
+     * @param title  标题
      */
     @Override
     public ResponseJson<PaginationVo<ShopBannerVo>> getShopHomeImages(Integer shopId, String title, int pageNum, int pageSize) {
@@ -813,15 +838,17 @@ public class ShopServiceImpl implements ShopService {
         infoTypes(articleTypeList);
         return ResponseJson.success(articleTypeList);
     }
-    public void infoTypes(List<ArticleTypeVo> articleTypes ) {
-        articleTypes.forEach(type->{
+
+    public void infoTypes(List<ArticleTypeVo> articleTypes) {
+        articleTypes.forEach(type -> {
             List<ArticleTypeVo> articleTypes1 = articleMapper.getArticleTypeList(type.getTypeId().toString());
-            if(articleTypes1.size()>0){
+            if (articleTypes1.size() > 0) {
                 type.setArticleTypes(articleTypes1);
                 infoTypes(articleTypes1);
             }
         });
     }
+
     @Override
     public ResponseJson<Void> deleteArticle(Integer articleId) {
         articleMapper.deleteArticle(articleId);
@@ -1087,7 +1114,7 @@ public class ShopServiceImpl implements ShopService {
         // 获取报表对应供应商数据
         CmMarketShopVo shopInfo = shopMapper.getShopInfoById(shopId, type, marketReportId);
         List<Integer> marketReportIds = shopMapper.getMarketReportIds(shopInfo.getId(), type, marketReportId, startTime, endTime);
-        log.info("marketReportIds===="+marketReportIds);
+        log.info("marketReportIds====" + marketReportIds);
         // 获取阶段描述
         List<StageVo> summarize = new ArrayList<>();
         List<StageVo> summarize1 = new ArrayList<>();
@@ -1131,11 +1158,11 @@ public class ShopServiceImpl implements ShopService {
             }
             try {
                 if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
-                    shopInfo.setChartTitle("("+startTime.replaceAll("-", "/") + "-" + endTime.replaceAll("-", "/")+")");
+                    shopInfo.setChartTitle("(" + startTime.replaceAll("-", "/") + "-" + endTime.replaceAll("-", "/") + ")");
                 } else if (1 == type && null != marketReportId) {
-                    shopInfo.setChartTitle("("+dateFormat.format(dateFormat.parse(shopInfo.getReportDate())).replaceAll("-", "/")+")");
+                    shopInfo.setChartTitle("(" + dateFormat.format(dateFormat.parse(shopInfo.getReportDate())).replaceAll("-", "/") + ")");
                 } else {
-                    shopInfo.setChartTitle("("+ (StringUtils.isNotBlank(shopInfo.getEndDate()) ? dateFormat.format(dateFormat.parse(shopInfo.getEndDate())).replaceAll("-", "/") : "") + ")");
+                    shopInfo.setChartTitle("(" + (StringUtils.isNotBlank(shopInfo.getEndDate()) ? dateFormat.format(dateFormat.parse(shopInfo.getEndDate())).replaceAll("-", "/") : "") + ")");
                 }
             } catch (ParseException e) {
                 e.printStackTrace();
@@ -1220,7 +1247,11 @@ public class ShopServiceImpl implements ShopService {
         // 获取点击量数据
         name = new ArrayList<>();
         value = new ArrayList<>();
-        generalNumber = 0; microBlog = 0; redBookNumber = 0; otherNumber = 0;pointSingNumber = 0;
+        generalNumber = 0;
+        microBlog = 0;
+        redBookNumber = 0;
+        otherNumber = 0;
+        pointSingNumber = 0;
         if (null != marketReportIds && marketReportIds.size() > 0) {
             List<ReadVolumeVo> marketReadVolume = shopMapper.getMarketReadVolume(marketReportIds);
             if (null != marketReadVolume && marketReadVolume.size() > 0) {
@@ -1395,22 +1426,22 @@ public class ShopServiceImpl implements ShopService {
             if (StringUtils.isBlank(startTime)) {
                 startTime = monthFirstDay(shopInfo.getReportDate());
             }
-            if(StringUtils.isBlank(endTime)) {
+            if (StringUtils.isBlank(endTime)) {
                 endTime = monthLastDay(shopInfo.getReportDate());
             }
-        } else{
+        } else {
             // 供应商主页进入
             if (StringUtils.isBlank(startTime)) {
                 startTime = shopInfo.getStartDate();
             }
-            if(StringUtils.isBlank(endTime)) {
+            if (StringUtils.isBlank(endTime)) {
                 endTime = shopInfo.getEndDate();
             }
 
         }
-        log.info("startTime===="+startTime);
-        log.info("endTime===="+endTime);
-        log.info("shopKeyword===="+shopKeyword);
+        log.info("startTime====" + startTime);
+        log.info("endTime====" + endTime);
+        log.info("shopKeyword====" + shopKeyword);
         if (null != shopKeyword && shopKeyword.size() > 0) {
             // 访问供应商用户对于所在地区
             List<String> region = shopMapper.getRegion(startTime, endTime, shopKeyword);
@@ -1432,7 +1463,7 @@ public class ShopServiceImpl implements ShopService {
             set = new HashSet<>();
             List<ReturnEntityVo> userIdentity1 = shopMapper.getUserIdentity(startTime, endTime, shopKeyword);
             if (null != userIdentity1 && userIdentity1.size() > 0) {
-                userIdentity1.removeIf( user -> StringUtils.isBlank(user.getName()));
+                userIdentity1.removeIf(user -> StringUtils.isBlank(user.getName()));
                 // 所有值之和
                 AtomicInteger maxUserValue = new AtomicInteger(0);
                 for (ReturnEntityVo returnEntityVo : userIdentity1) {
@@ -1446,19 +1477,19 @@ public class ShopServiceImpl implements ShopService {
                         }
                     }
                 }
-                userIdentity.forEach( user -> maxUserValue.set(MathUtil.add(Integer.parseInt(user.getValue()), maxUserValue.get()).intValue()));
+                userIdentity.forEach(user -> maxUserValue.set(MathUtil.add(Integer.parseInt(user.getValue()), maxUserValue.get()).intValue()));
                 userIdentity.forEach(returnUserIdentity -> {
-                    log.info("returnUserIdentity.getValue()==="+returnUserIdentity.getValue());
-                    log.info("maxUserValue.get()==="+maxUserValue.get());
+                    log.info("returnUserIdentity.getValue()===" + returnUserIdentity.getValue());
+                    log.info("maxUserValue.get()===" + maxUserValue.get());
                     String values = MathUtil.mul(MathUtil.div(returnUserIdentity.getValue(), maxUserValue.get(), 2), 100).toString();
-                    log.info("values==="+values);
+                    log.info("values===" + values);
                     returnUserIdentity.setValue(values);
                 });
             }
             set = new HashSet<>();
             List<ReturnEntityVo> clubType1 = shopMapper.getClubType(startTime, endTime, shopKeyword);
             if (null != clubType1 && clubType1.size() > 0) {
-                clubType1.removeIf( club -> StringUtils.isBlank(club.getName()));
+                clubType1.removeIf(club -> StringUtils.isBlank(club.getName()));
                 // 所有值之和
                 AtomicInteger maxClubTypeValue = new AtomicInteger(0);
                 for (ReturnEntityVo returnEntityVo : clubType1) {
@@ -1472,12 +1503,12 @@ public class ShopServiceImpl implements ShopService {
                         }
                     }
                 }
-                clubType.forEach( club -> maxClubTypeValue.set(MathUtil.add(Integer.parseInt(club.getValue()), maxClubTypeValue.get()).intValue()));
+                clubType.forEach(club -> maxClubTypeValue.set(MathUtil.add(Integer.parseInt(club.getValue()), maxClubTypeValue.get()).intValue()));
                 clubType.forEach(returnUserIdentity -> {
-                    log.info("returnUserIdentity.getValue()==="+returnUserIdentity.getValue());
-                    log.info("maxClubTypeValue.get()==="+maxClubTypeValue.get());
+                    log.info("returnUserIdentity.getValue()===" + returnUserIdentity.getValue());
+                    log.info("maxClubTypeValue.get()===" + maxClubTypeValue.get());
                     String values = MathUtil.mul(MathUtil.div(returnUserIdentity.getValue(), maxClubTypeValue.get(), 2), 100).toString();
-                    log.info("values==="+values);
+                    log.info("values===" + values);
                     returnUserIdentity.setValue(values);
                 });
             }
@@ -1506,7 +1537,8 @@ public class ShopServiceImpl implements ShopService {
 
     /**
      * 获取该月份首日日期
-     * @param reportDate    2023-12
+     *
+     * @param reportDate 2023-12
      * @return
      */
     public String monthFirstDay(String reportDate) {
@@ -1520,7 +1552,8 @@ public class ShopServiceImpl implements ShopService {
 
     /**
      * 获取该月份最后一天日期
-     * @param reportDate    2023-12
+     *
+     * @param reportDate 2023-12
      * @return
      */
     public String monthLastDay(String reportDate) {
@@ -1536,6 +1569,7 @@ public class ShopServiceImpl implements ShopService {
     /**
      * 不包含的月份
      * todo 暂定5年
+     *
      * @param marketReportDataList
      * @return
      */

src/main/resources/mapper/ClubMapper.xml

@@ -971,7 +971,7 @@
         ORDER BY ccr.addtime DESC
     </select>
     <select id="findLeaderId" resultType="java.lang.Integer">
-        SELECT leaderId
+        SELECT csr.leaderId
         FROM cm_serviceteam_role csr
                  LEFT JOIN serviceprovider s ON s.serviceProviderId = csr.leaderId
         WHERE s.serviceProviderID = #{serviceProviderId}

src/main/resources/mapper/SellerMapper.xml

@@ -411,14 +411,9 @@
                s.linkMan,
                s.duty,
                s.contractEmail,
-               s.auditStatus,
-               s.auditTime,
-               s.auditNote,
-               s.validFlag,
                s.addTime,
                s.qrCode,
-               u.image,
-               s.mainServiceProviderID AS mainServiceProviderId
+               u.image
         from serviceprovider s
         LEFT JOIN USER u ON s.userId = u.userId
         where s.userID = #{userId}
@@ -438,9 +433,9 @@
         WHERE s.userID = #{userId}
     </select>
     <select id="findLeaderId" resultType="java.lang.Integer">
-        SELECT leaderId
+        SELECT csr.leaderId
         FROM cm_serviceteam_role csr
-                 LEFT JOIN serviceprovider s ON s.serviceProviderId = csr.leaderId
+        LEFT JOIN serviceprovider s ON s.serviceProviderId = csr.leaderId
         WHERE s.userId = #{userId}
     </select>
     <select id="findLeaderIdByServiceId" resultType="java.lang.Integer">

src/main/resources/mapper/ShopMapper.xml

@@ -699,4 +699,9 @@
         left join cm_shop_statistics css on css.id = cmr.marketId
         where cmr.delFlag = 0 and cmr.visible = 1 and css.shopId = #{shopId}
     </select>
+    <select id="findSpId" resultType="java.lang.Integer">
+        select ifnull(spId,1342)
+        from club
+        where userId = #{userId}
+    </select>
 </mapper>