Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantProxyDividendDao.java

@@ -30,7 +30,7 @@ public interface TenantProxyDividendDao extends BaseMapper<TenantProxyDividend>
      */
     <T> IPage<T> queryProxyDividendInfo(Page<T> page, @Param("param") Map<String, Object> param);
 
-   int queryProxyDividendCount(@Param("param") Map<String, Object> param);
+   int queryProxyDividendCount();
 
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ProxyDividendInfoVo.java

@@ -0,0 +1,89 @@
+package com.ym.mec.biz.dal.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(value = "代理商人分润信息")
+public class ProxyDividendInfoVo implements Serializable {
+    @ApiModelProperty(value = "代理商id")
+    private Integer proxyId;
+
+    @ApiModelProperty(value = "代理商名称")
+    private String proxyName;
+
+    @ApiModelProperty(value = "机构id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String tenantName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "激活时间")
+    private Date activeDate;
+
+    @ApiModelProperty(value = "激活数量")
+    private Integer activeCount;
+
+    @ApiModelProperty(value = "推荐人")
+    private String recommenderName;
+
+    public Integer getProxyId() {
+        return proxyId;
+    }
+
+    public void setProxyId(Integer proxyId) {
+        this.proxyId = proxyId;
+    }
+
+    public String getProxyName() {
+        return proxyName;
+    }
+
+    public void setProxyName(String proxyName) {
+        this.proxyName = proxyName;
+    }
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public Date getActiveDate() {
+        return activeDate;
+    }
+
+    public void setActiveDate(Date activeDate) {
+        this.activeDate = activeDate;
+    }
+
+    public Integer getActiveCount() {
+        return activeCount;
+    }
+
+    public void setActiveCount(Integer activeCount) {
+        this.activeCount = activeCount;
+    }
+
+    public String getRecommenderName() {
+        return recommenderName;
+    }
+
+    public void setRecommenderName(String recommenderName) {
+        this.recommenderName = recommenderName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ProxyDividendVo.java

@@ -1,12 +1,9 @@
 package com.ym.mec.biz.dal.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @ApiModel(value = "代理商人分润")
 public class ProxyDividendVo implements Serializable {
@@ -16,89 +13,6 @@ public class ProxyDividendVo implements Serializable {
     private Integer preTenant;
     @ApiModelProperty(value = "团练宝销售数")
     private Integer memberCount;
-    @ApiModelProperty(value = "分页-分润数据")
-    private PageInfo<ProxyDividendInfoVo> pageData;
-
-    @ApiModel(value = "代理商人分润信息")
-    public static class ProxyDividendInfoVo {
-        @ApiModelProperty(value = "代理商id")
-        private Integer proxyId;
-
-        @ApiModelProperty(value = "代理商名称")
-        private String proxyName;
-
-        @ApiModelProperty(value = "机构id")
-        private Integer tenantId;
-
-        @ApiModelProperty(value = "机构名称")
-        private String tenantName;
-
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        @ApiModelProperty(value = "激活时间")
-        private Date activeDate;
-
-        @ApiModelProperty(value = "激活数量")
-        private Integer activeCount;
-
-        @ApiModelProperty(value = "推荐人")
-        private String recommenderName;
-
-        public Integer getProxyId() {
-            return proxyId;
-        }
-
-        public void setProxyId(Integer proxyId) {
-            this.proxyId = proxyId;
-        }
-
-        public String getProxyName() {
-            return proxyName;
-        }
-
-        public void setProxyName(String proxyName) {
-            this.proxyName = proxyName;
-        }
-
-        public Integer getTenantId() {
-            return tenantId;
-        }
-
-        public void setTenantId(Integer tenantId) {
-            this.tenantId = tenantId;
-        }
-
-        public String getTenantName() {
-            return tenantName;
-        }
-
-        public void setTenantName(String tenantName) {
-            this.tenantName = tenantName;
-        }
-
-        public Date getActiveDate() {
-            return activeDate;
-        }
-
-        public void setActiveDate(Date activeDate) {
-            this.activeDate = activeDate;
-        }
-
-        public Integer getActiveCount() {
-            return activeCount;
-        }
-
-        public void setActiveCount(Integer activeCount) {
-            this.activeCount = activeCount;
-        }
-
-        public String getRecommenderName() {
-            return recommenderName;
-        }
-
-        public void setRecommenderName(String recommenderName) {
-            this.recommenderName = recommenderName;
-        }
-    }
 
     public Integer getTenantAgency() {
         return tenantAgency;
@@ -124,11 +38,4 @@ public class ProxyDividendVo implements Serializable {
         this.memberCount = memberCount;
     }
 
-    public PageInfo<ProxyDividendInfoVo> getPageData() {
-        return pageData;
-    }
-
-    public void setPageData(PageInfo<ProxyDividendInfoVo> pageData) {
-        this.pageData = pageData;
-    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TenantProxyDividendService.java

@@ -3,7 +3,9 @@ package com.ym.mec.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.dao.TenantProxyDividendDao;
 import com.ym.mec.biz.dal.entity.TenantProxyDividend;
+import com.ym.mec.biz.dal.vo.ProxyDividendInfoVo;
 import com.ym.mec.biz.dal.vo.ProxyDividendVo;
+import com.ym.mec.common.page.PageInfo;
 
 import java.util.Map;
 
@@ -18,6 +20,11 @@ public interface TenantProxyDividendService extends IService<TenantProxyDividend
     TenantProxyDividendDao getDao();
 
     /**
+     * 代理商分润汇总查询
+     */
+    ProxyDividendVo queryProxyDividend();
+
+    /**
      * 代理商分润查询
      *
      * @param param 传入参数
@@ -29,7 +36,7 @@ public interface TenantProxyDividendService extends IService<TenantProxyDividend
      *              <p> - row 条数
      *              <p> - page 页数
      */
-    ProxyDividendVo queryProxyDividend(Map<String, Object> param);
+    PageInfo<ProxyDividendInfoVo> queryProxyDividendInfo(Map<String, Object> param);
 
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyDividendServiceImpl.java

@@ -4,13 +4,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TenantProxyDividendDao;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
 import com.ym.mec.biz.dal.entity.TenantProxyDividend;
+import com.ym.mec.biz.dal.entity.TenantProxyUserRelation;
+import com.ym.mec.biz.dal.vo.ProxyDividendInfoVo;
 import com.ym.mec.biz.dal.vo.ProxyDividendVo;
 import com.ym.mec.biz.service.TenantPreJoinService;
 import com.ym.mec.biz.service.TenantProxyDividendService;
+import com.ym.mec.biz.service.TenantProxyUserRelationService;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -20,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 
@@ -36,6 +43,10 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
 
     @Autowired
     private TenantPreJoinService tenantPreJoinService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private TenantProxyUserRelationService tenantProxyUserRelationService;
 
     @Override
     public TenantProxyDividendDao getDao() {
@@ -43,6 +54,30 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
     }
 
     /**
+     * 代理商分润汇总查询
+     */
+    @Override
+    public ProxyDividendVo queryProxyDividend() {
+        ProxyDividendVo result = new ProxyDividendVo();
+        result.setPreTenant(0);
+        result.setTenantAgency(0);
+        //查询入驻信息
+        List<TenantPreJoin> preJoinsList = tenantPreJoinService.list();
+        if (CollectionUtils.isNotEmpty(preJoinsList)) {
+            result.setTenantAgency(preJoinsList.size());
+            long count = preJoinsList.stream()
+                    .filter(a -> Objects.nonNull(a.getState()) && a.getState() == 1)
+                    .count();
+            result.setPreTenant((int) count);
+        }
+
+        //团练宝销售数
+        int count = baseMapper.queryProxyDividendCount();
+        result.setMemberCount(count);
+        return result;
+    }
+
+    /**
      * 代理商分润查询
      *
      * @param param 传入参数
@@ -55,7 +90,7 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
      * @return
      */
     @Override
-    public ProxyDividendVo queryProxyDividend(Map<String, Object> param) {
+    public PageInfo<ProxyDividendInfoVo> queryProxyDividendInfo(Map<String, Object> param) {
         Optional.ofNullable(param.get("startData")).orElseThrow(() -> new BizException("查询的开始日期不能为空！"));
         Optional.ofNullable(param.get("endData")).orElseThrow(() -> new BizException("查询的结束日期不能为空！"));
         //拼接时分秒
@@ -64,30 +99,27 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
         addTimeCons.accept("startData", "00:00:00");
         addTimeCons.accept("endData", "23:59:59");
 
-        ProxyDividendVo result = new ProxyDividendVo();
-        result.setPreTenant(0);
-        result.setTenantAgency(0);
-        //查询入驻信息
-        List<TenantPreJoin> preJoinsList = tenantPreJoinService.list(Wrappers.<TenantPreJoin>lambdaQuery()
-                .ge(TenantPreJoin::getCreatedTime, param.get("startData"))
-                .le(TenantPreJoin::getCreatedTime, param.get("endData")));
-        if (CollectionUtils.isNotEmpty(preJoinsList)) {
-            result.setTenantAgency(preJoinsList.size());
-            long count = preJoinsList.stream().filter(a -> a.getState() == 1).count();
-            result.setPreTenant((int) count);
+        SysUser user = getUser();
+        //当前登录人是代理商账号类型，需要做数据隔离
+        if (user.getUserType().equalsIgnoreCase("PROXY")) {
+            //查询代理商
+            TenantProxyUserRelation proxyUserRelation = tenantProxyUserRelationService.getOne(Wrappers.<TenantProxyUserRelation>lambdaQuery()
+                    .eq(TenantProxyUserRelation::getUserId, user.getId()));
+            if (Objects.nonNull(proxyUserRelation)) {
+                param.put("proxyId", proxyUserRelation.getProxyId());
+            }
         }
-
-        //团练宝销售数
-        int count = baseMapper.queryProxyDividendCount(param);
-        result.setMemberCount(count);
-
         //分页查询分润记录
-        Page<ProxyDividendVo.ProxyDividendInfoVo> pageInfo = PageUtil.getPageInfo(param);
+        Page<ProxyDividendInfoVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("a.active_time_");
-        IPage<ProxyDividendVo.ProxyDividendInfoVo> tiPage = baseMapper.queryProxyDividendInfo(pageInfo, param);
-        result.setPageData(PageUtil.pageInfo(tiPage));
-        return result;
+        IPage<ProxyDividendInfoVo> tiPage = baseMapper.queryProxyDividendInfo(pageInfo, param);
+        return PageUtil.pageInfo(tiPage);
     }
 
+    private SysUser getUser() {
+        //修改机构基础信息
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo())
+                .orElseThrow(() -> new BizException("用户信息获取失败,请刷新页面或者重新登录!"));
+    }
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyInfoServiceImpl.java

@@ -59,7 +59,7 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
         Integer opsUserId = getUser().getId();
         Date now = new Date();
         //添加sysUser人员信息
-        Integer userId = addSysUser(dto);
+        Integer userId = addSysUser(dto, "PROXY");
         //添加代理商信息表
         TenantProxyInfo proxyInfo = new TenantProxyInfo();
         proxyInfo.setProxyName(dto.getProxyName());
@@ -86,7 +86,7 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
         //获取父级Id
         Integer parentId = Optional.ofNullable(dto.getParentId()).orElseGet(() -> getUser().getId());
         //员工id
-        Integer userId = addSysUser(dto);
+        Integer userId = addSysUser(dto, null);
         //查询父级信息
         TenantProxyUserRelation parentProxyUser = proxyUserRelationService.getOne(Wrappers.<TenantProxyUserRelation>lambdaQuery()
                 .eq(TenantProxyUserRelation::getUserId, parentId)
@@ -107,7 +107,7 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
      *
      * @return id
      */
-    private Integer addSysUser(TenantProxyDto dto) {
+    private Integer addSysUser(TenantProxyDto dto, String userType) {
         SysUser sysUser = sysUserFeignService.queryUserByMobile(dto.getPhone());
         if (Objects.nonNull(sysUser)) {
             throw new BizException("该手机号在系统已存在！");
@@ -116,7 +116,7 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
         sysUser.setTenantId(-1);
         sysUser.setUsername(dto.getName());
         sysUser.setPhone(dto.getPhone());
-        sysUser.setUserType("PROXY");
+        sysUser.setUserType(userType);
         sysUser.setRealName(dto.getName());
         baseMapper.insertProxySysUser(sysUser);
         return sysUser.getId();

mec-biz/src/main/resources/config/mybatis/TenantProxyDividendMapper.xml

@@ -24,7 +24,7 @@
         </foreach>
     </insert>
 
-    <select id="queryProxyDividendInfo" resultType="com.ym.mec.biz.dal.vo.ProxyDividendVo$ProxyDividendInfoVo">
+    <select id="queryProxyDividendInfo"  parameterType="map" resultType="com.ym.mec.biz.dal.vo.ProxyDividendInfoVo">
         select a.proxy_id_ as proxyId,
         b.proxy_name_ as proxyName,
         c.id_ as tenantId,
@@ -43,35 +43,21 @@
             <if test="param.recommenderId != null">
                 AND c.recommender_ = #{param.recommenderId}
             </if>
-            <if test="param.startDate != null">
-                AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}
+            <if test="param.startData != null and param.startData != ''">
+                AND a.active_time_ <![CDATA[ >= ]]> #{param.startData}
             </if>
-            <if test="param.endDate != null">
-                AND a.active_time_ <![CDATA[ <= ]]> #{param.endDate}
+            <if test="param.endData != null and param.endData != ''">
+                AND a.active_time_ <![CDATA[ <= ]]> #{param.endData}
             </if>
         </where>
     </select>
 
-    <select id="queryProxyDividendCount" resultType="int" parameterType="map">
-        select SUM(IFNULL(a.total_month_,0)) as activeCount
+    <select id="queryProxyDividendCount" resultType="int">
+        select IFNULL(SUM(a.total_month_), 0)  as activeCount
         from tenant_proxy_dividend as a
         left join tenant_proxy_info as b on a.proxy_id_ = b.id_
         left join tenant_info as c on a.tenant_id_ = c.id_
         left join sys_user as d on c.recommender_ = d.id_
-        <where>
-            <if test="param.proxyId != null">
-                AND a.proxy_id_ = #{param.proxyId}
-            </if>
-            <if test="param.recommenderId != null">
-                AND c.recommender_ = #{param.recommenderId}
-            </if>
-            <if test="param.startDate != null">
-                AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}
-            </if>
-            <if test="param.endDate != null">
-                AND a.active_time_ <![CDATA[ <= ]]> #{param.endDate}
-            </if>
-        </where>
     </select>
 
 </mapper>

mec-biz/src/main/resources/config/mybatis/TenantProxyInfoMapper.xml

@@ -60,7 +60,7 @@
         where a.parent_id_ = #{id}
     </select>
 
-    <select id="queryProxyUser" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
+    <select id="queryProxyUser" parameterType="map" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
         select
             b.id_ as userId,
             c.id_ as proxyId,
@@ -87,7 +87,7 @@
         </where>
     </select>
 
-    <select id="queryUserList" resultType="com.ym.mec.auth.api.entity.SysUser">
+    <select id="queryUserList" parameterType="map" resultType="com.ym.mec.auth.api.entity.SysUser">
         select id_ as id,
                real_name_ as realName,
                phone_ as phone

mec-web/src/main/java/com/ym/mec/web/controller/TenantPreJoinController.java

@@ -45,10 +45,11 @@ public class TenantPreJoinController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('tenantPreJoin/queryPage')")
     public HttpResponseResult<PageInfo<TenantPreJoinVo>> queryPage(@RequestBody Map<String, Object> param) {
         //如果不是超管，那么只能看到推荐人自己的机构
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(!sysUser.getIsSuperAdmin()){
-            param.put("recommender",sysUser.getId());
-        }
+        //2022年4月26日 需求要求变更为平台账号就看所有数据
+//        SysUser sysUser = sysUserFeignService.queryUserInfo();
+//        if(!sysUser.getIsSuperAdmin()){
+//            param.put("recommender",sysUser.getId());
+//        }
         return succeed(tenantPreJoinService.queryPage(param));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/TenantProxyDividendController.java

@@ -1,10 +1,12 @@
 package com.ym.mec.web.controller;
 
 
+import com.ym.mec.biz.dal.vo.ProxyDividendInfoVo;
 import com.ym.mec.biz.dal.vo.ProxyDividendVo;
 import com.ym.mec.biz.service.TenantProxyDividendService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -33,6 +35,12 @@ public class TenantProxyDividendController extends BaseController {
     @Resource
     private TenantProxyDividendService tenantProxyDividendService;
 
+    @ApiOperation("代理商分润汇总查询")
+    @PostMapping(value = "/queryProxyDividend")
+    public HttpResponseResult<ProxyDividendVo> queryProxyDividend() {
+        return succeed(tenantProxyDividendService.queryProxyDividend());
+    }
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "proxyId", dataType = "Integer", value = "代理商id"),
             @ApiImplicitParam(name = "recommenderId", dataType = "Integer", value = "推荐人id"),
@@ -41,10 +49,10 @@ public class TenantProxyDividendController extends BaseController {
             @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
             @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
     })
-    @ApiOperation("代理商分润查询")
-    @PostMapping(value = "/queryProxyDividend")
-    public HttpResponseResult<ProxyDividendVo> queryProxyDividend(@RequestBody Map<String, Object> param) {
-        return succeed(tenantProxyDividendService.queryProxyDividend(param));
+    @ApiOperation("代理商分润明细查询")
+    @PostMapping(value = "/queryProxyDividendInfo")
+    public HttpResponseResult<PageInfo<ProxyDividendInfoVo>> queryProxyDividendInfo(@RequestBody Map<String, Object> param) {
+        return succeed(tenantProxyDividendService.queryProxyDividendInfo(param));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/TenantProxyInfoController.java

@@ -12,9 +12,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +38,7 @@ public class TenantProxyInfoController extends BaseController {
 
     @ApiOperation("添加代理商信息")
     @PostMapping(value = "/addProxyInfo")
-    public HttpResponseResult<Object> addProxyInfo(@RequestBody TenantProxyDto dto) {
+    public HttpResponseResult<Object> addProxyInfo(@Valid @RequestBody TenantProxyDto dto) {
         tenantProxyInfoService.addProxyInfo(dto);
         return succeed();
     }