Merge branch 'hgw-代理商分润' into master_saas

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

@@ -34,6 +34,14 @@ public interface TenantProxyInfoDao extends BaseMapper<TenantProxyInfo> {
     int updateProxySysUserLock(@Param("id") Integer id, @Param("lock") Integer lock);
 
     /**
+     * 修改sysUser表
+     *
+     * @param id    人员id
+     * @param phone 手机号
+     */
+    int updateSysUserPhone(@Param("id") Integer id, @Param("phone") String phone,@Param("name") String name);
+
+    /**
      * 查询代理商下级人员数据
      *
      * @param id 代理商负责人id
@@ -42,6 +50,7 @@ public interface TenantProxyInfoDao extends BaseMapper<TenantProxyInfo> {
 
     /**
      * 分页查询代理商负责人数据
+     *
      * @param param 传入参数
      *              <p> - state  状态 0正常 1冻结
      *              <p> - search 模糊搜索关键字

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

@@ -1,20 +0,0 @@
-package com.ym.mec.biz.dal.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ym.mec.biz.dal.entity.TenantProxyRelation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 机构与代理商人员关系表(TenantProxyRelation)表数据库访问层
- *
- * @author hgw
- * @since 2022-04-22 14:08:20
- */
-public interface TenantProxyRelationDao extends BaseMapper<TenantProxyRelation> {
-
-    int insertBatch(@Param("entities") List<TenantProxyRelation> entities);
-
-}
-

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TenantProxyDto.java

@@ -14,6 +14,9 @@ import java.io.Serializable;
 @ApiModel(value = "代理商信息参数")
 public class TenantProxyDto implements Serializable {
 
+    @ApiModelProperty(value = "人员id")
+    private Integer userId;
+
     @ApiModelProperty(value = "父级人员id")
     private Integer parentId;
 
@@ -21,7 +24,7 @@ public class TenantProxyDto implements Serializable {
     private String proxyName;
 
     @NotBlank(message = "人员名称不能为空")
-    @ApiModelProperty(value = "负责人名称")
+    @ApiModelProperty(value = "人员名称")
     private String name;
 
     @NotBlank(message = "手机号不能为空")
@@ -30,6 +33,14 @@ public class TenantProxyDto implements Serializable {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getProxyName() {
         return proxyName;
     }

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

@@ -8,6 +8,9 @@ import java.io.Serializable;
 @ApiModel(value = "代理商人员信息")
 public class ProxyUserVo implements Serializable {
 
+    @ApiModelProperty(value = "当前人员id")
+    private Integer userId;
+
     @ApiModelProperty(value = "代理商id")
     private Integer proxyId;
 
@@ -26,6 +29,14 @@ public class ProxyUserVo implements Serializable {
     @ApiModelProperty(value = "状态 0正常 1冻结 ")
     private Integer state;
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public Integer getProxyId() {
         return proxyId;
     }

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

@@ -52,8 +52,13 @@ public interface TenantProxyInfoService extends IService<TenantProxyInfo> {
      * 冻结/解冻代理商
      *
      * @param userId 代理负责人id
-     * @param state 状态 0正常 1冻结
+     * @param state  状态 0正常 1冻结
      */
     void freezeProxy(Integer userId, Integer state);
+
+    /**
+     * 修改人员信息
+     */
+    void updateProxyUserInfo(TenantProxyDto dto);
 }
 

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

@@ -1,17 +0,0 @@
-package com.ym.mec.biz.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ym.mec.biz.dal.dao.TenantProxyRelationDao;
-import com.ym.mec.biz.dal.entity.TenantProxyRelation;
-
-/**
- * 机构与代理商人员关系表(TenantProxyRelation)表服务接口
- *
- * @author hgw
- * @since 2022-04-22 14:08:21
- */
-public interface TenantProxyRelationService extends IService<TenantProxyRelation> {
-
-    TenantProxyRelationDao getDao();
-}
-

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

@@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * 机构代理商信息表(TenantProxyInfo)表服务实现类
@@ -149,18 +146,42 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
      * @param userId 代理负责人id
      * @param state  状态 0正常 1冻结
      */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public void freezeProxy(Integer userId, Integer state) {
         //sysUser表 lock字段 9冻结 0解冻
         Integer lockFlag = state == 0 ? state : 9;
         //先冻结sysUser表
         baseMapper.updateProxySysUserLock(userId, lockFlag);
         //在修改代理商表
-        TenantProxyInfo tenantProxyInfo = this.getOne(Wrappers.<TenantProxyInfo>lambdaUpdate().eq(TenantProxyInfo::getProxyUserId, userId));
+        TenantProxyInfo tenantProxyInfo = this.getOne(Wrappers.<TenantProxyInfo>lambdaUpdate()
+                .eq(TenantProxyInfo::getProxyUserId, userId));
         tenantProxyInfo.setState(state);
         this.updateById(tenantProxyInfo);
     }
 
     /**
+     * 修改人员信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateProxyUserInfo(TenantProxyDto dto){
+        Optional.ofNullable(dto.getUserId()).orElseThrow(() -> new BizException("人员id不能为空"));
+        //查询父级信息
+        TenantProxyUserRelation parentProxyUser = proxyUserRelationService.getOne(Wrappers.<TenantProxyUserRelation>lambdaQuery()
+                .eq(TenantProxyUserRelation::getUserId, dto.getUserId()));
+        //判断本次修改的是不是代理商负责人，如果是负责人可能要修改代理商名称
+        if(Objects.nonNull(parentProxyUser.getParentId())){
+            TenantProxyInfo tenantProxyInfo = this.getOne(Wrappers.<TenantProxyInfo>lambdaUpdate()
+                    .eq(TenantProxyInfo::getProxyUserId, dto.getUserId()));
+            tenantProxyInfo.setProxyName(dto.getProxyName());
+            this.updateById(tenantProxyInfo);
+        }
+        baseMapper.updateSysUserPhone(dto.getUserId(),dto.getPhone(),dto.getName());
+    }
+
+
+    /**
      * 查询代理商数据
      * 模糊：姓名 手机号
      * 模糊：代理商

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

@@ -1,35 +0,0 @@
-package com.ym.mec.biz.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ym.mec.biz.dal.dao.TenantProxyRelationDao;
-import com.ym.mec.biz.dal.entity.TenantProxyRelation;
-import com.ym.mec.biz.service.TenantProxyRelationService;
-import org.springframework.stereotype.Service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 机构与代理商人员关系表(TenantProxyRelation)表服务实现类
- *
- * @author hgw
- * @since 2022-04-22 14:08:21
- */
-@Service("tenantProxyRelationService")
-public class TenantProxyRelationServiceImpl extends ServiceImpl<TenantProxyRelationDao, TenantProxyRelation> implements TenantProxyRelationService {
-
-    private final static Logger log = LoggerFactory.getLogger(TenantProxyRelationServiceImpl.class);
-
-    @Override
-    public TenantProxyRelationDao getDao() {
-        return this.baseMapper;
-    }
-
-    /**
-     * 创建机构时，如果有推荐人并是代理商需要写入代理商与机构关系表
-     */
-    public void createTenantProxyRelation(TenantProxyRelation tenantProxyRelation) {
-        this.save(tenantProxyRelation);
-    }
-}
-

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

@@ -32,17 +32,27 @@
         VALUES(#{tenantId},#{username},#{phone},#{password},now(),#{userType},#{realName})
     </insert>
 
-    <update id="updateProxySysUserLock">
+    <update id="updateProxySysUserLock" parameterType="object">
         update sys_user set lock_flag_ = #{lock} where id_ = #{id}
     </update>
 
+    <update id="updateSysUserPhone" parameterType="object">
+        update sys_user
+        set phone_     = #{phone},
+            username_  = #{name},
+            real_name_ = #{name}
+        where id_ = #{id}
+    </update>
+
     <select id="queryProxyUserStaff" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
-        select c.id_ as proxyId,
-               c.proxy_name_ as proxyName,
-               b.real_name_ as `name`,
-               b.phone_ as `phone`,
-               '员工' as `role`,
-               c.state_ as state
+        select
+            b.id_ as userId,
+            c.id_ as proxyId,
+            c.proxy_name_ as proxyName,
+            b.real_name_ as `name`,
+            b.phone_ as `phone`,
+            '员工' as `role`,
+            c.state_ as state
         from tenant_proxy_user_relation as a
                  left join tenant_proxy_info c on a.parent_id_ = c.proxy_user_id_
                  left join sys_user as b  on a.parent_id_ = b.id_
@@ -50,12 +60,14 @@
     </select>
 
     <select id="queryProxyUser" resultType="com.ym.mec.biz.dal.vo.ProxyUserVo">
-        select c.id_ as proxyId,
-               c.proxy_name_ as proxyName,
-               b.real_name_ as `name`,
-               b.phone_ as `phone`,
-               '负责人' as `role`,
-               c.state_ as state
+        select
+            b.id_ as userId,
+            c.id_ as proxyId,
+            c.proxy_name_ as proxyName,
+            b.real_name_ as `name`,
+            b.phone_ as `phone`,
+            '负责人' as `role`,
+            c.state_ as state
         from tenant_proxy_user_relation as a
                  left join tenant_proxy_info c on a.parent_id_ = c.proxy_user_id_
                  left join sys_user as b  on a.parent_id_ = b.id_

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.biz.dal.dao.TenantProxyRelationDao">
-    <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.TenantProxyRelation">
-        <id column="id_" jdbcType="INTEGER" property="id"/>
-        <result column="proxy_id_" jdbcType="VARCHAR" property="proxyId"/>
-        <result column="user_id_" jdbcType="INTEGER" property="userId"/>
-        <result column="tenant_id_" jdbcType="INTEGER" property="tenantId"/>
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id_
-        , proxy_id_, user_id_, tenant_id_, create_time_
-    </sql>
-
-    <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
-            parameterType="com.ym.mec.biz.dal.entity.TenantProxyRelation">
-        insert into tenant_proxy_relation(proxy_id_, user_id_, tenant_id_, create_time_)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.proxyId}, #{entity.userId}, #{entity.tenantId}, #{entity.createTime})
-        </foreach>
-    </insert>
-
-</mapper>

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

@@ -51,8 +51,7 @@ public class TenantProxyInfoController extends BaseController {
     @ApiImplicitParam(name = "id", value = "代理商负责人id", required = true, dataType = "Integer")
     @GetMapping("/queryProxyUserStaff")
     public HttpResponseResult<List<ProxyUserVo>> queryProxyUserStaff(Integer id) {
-        tenantProxyInfoService.queryProxyUserStaff(id);
-        return succeed();
+        return succeed(tenantProxyInfoService.queryProxyUserStaff(id));
     }
 
     @ApiImplicitParams({
@@ -78,5 +77,12 @@ public class TenantProxyInfoController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("修改人员信息")
+    @PostMapping(value = "/updateProxyUserInfo")
+    public HttpResponseResult<Object> updateProxyUserInfo(@RequestBody TenantProxyDto dto) {
+        tenantProxyInfoService.updateProxyUserInfo(dto);
+        return succeed();
+    }
+
 }
 

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

@@ -1,29 +0,0 @@
-package com.ym.mec.web.controller;
-
-
-import com.ym.mec.biz.dal.entity.TenantProxyRelation;
-import com.ym.mec.biz.service.TenantProxyRelationService;
-import org.springframework.web.bind.annotation.*;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-
-import javax.annotation.Resource;
-
-/**
- * 机构与代理商人员关系表(TenantProxyRelation)表控制层
- *
- * @author hgw
- * @since 2022-04-22 14:08:20
- */
-@Api(tags = "机构与代理商人员关系表")
-@RestController
-@RequestMapping("/tenantProxyRelation")
-public class TenantProxyRelationController extends BaseController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private TenantProxyRelationService tenantProxyRelationService;
-
-}
-