代理人app开发

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -1041,7 +1041,7 @@ public class SysUserController extends BaseController {
         if (Objects.isNull(sysUser1)){
             return HttpResult.error("推荐人信息不存在");
         }
-        sysUser.setDeptId(sysUser1.getDeptId());
+        sysUser.setDeptId(partnerUserMapper.queryDeptIdByUserId(sysUser1.getId(),sysUserVo.getSysUser().getGrade()));
         sysUser.setStatus(2); //直接默认为入司待审核
         LocalDate birthday = LocalDate.parse(sysUser.getIdentity().substring(6, 10) + "-" + sysUser.getIdentity().substring(10, 12) + "-" + sysUser.getIdentity().substring(12, 14));
         sysUserInfo.setBirthday(birthday);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1237,11 +1237,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return HttpResult.error("已存在代理人，不允许再添加！！");
         }
         SysUser sysUser = sysUserVo.getSysUser();
-        String grade = String.valueOf(sysUser.getGrade());
+        String grade = String.valueOf(sysUser.getGrade() + 1);
+        String deptId = sysUser.getDeptId();
         if (StringUtils.equals("4",grade) || StringUtils.equals("5",grade)){
-            addDeptUser(sysUser,grade);
+            deptId = addDeptUser(sysUser,grade);
         }
-        sysUser.setDeptId(sysUser.getDeptId());
+        sysUser.setDeptId(deptId);
 
         //处理密码
         if (StringUtils.isNotEmpty(sysUser.getPassword())) {
@@ -1252,7 +1253,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             return HttpResult.error("密码不能为空");
         }
-        String userId = gainNextUserId(sysUser.getDeptId());
+        String userId = gainNextUserId(deptId);
 
         sysUser.setId(userId);
         save(sysUser);
@@ -3709,17 +3710,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int minGrade = sortedGrades.get(0);
         boolean hasReferrer = StringUtils.isNotEmpty(sysUser.getReferrerId());
         for (int grade : sortedGrades) {
-            PartnerUser partnerUser = createPartnerUser(sysUser, grade, minGrade, hasReferrer);
+            String deptId = sysUser.getDeptId();
+            if (4 == grade){
+                deptId = addDeptUser(sysUser,String.valueOf(grade));
+            }
+            PartnerUser partnerUser = createPartnerUser(sysUser, grade, minGrade, hasReferrer,deptId);
             partnerUserService.save(partnerUser);
         }
     }
 
-    private PartnerUser createPartnerUser(SysUser sysUser, int grade, int minGrade, boolean hasReferrer) {
+    private PartnerUser createPartnerUser(SysUser sysUser, int grade, int minGrade, boolean hasReferrer,String deptId) {
         PartnerUser partnerUser = new PartnerUser();
         partnerUser.setName(sysUser.getName());
         partnerUser.setMobile(sysUser.getMobile());
         partnerUser.setUserId(sysUser.getId());
-        partnerUser.setDeptId(sysUser.getDeptId());
+        partnerUser.setDeptId(deptId);
         partnerUser.setDeptName(sysUser.getDeptName());
         partnerUser.setGrade(grade);
         partnerUser.setCreateTime(new Date());
@@ -3748,7 +3753,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return partnerUser;
     }
 
-     public  void addDeptUser(SysUser sysUser,String grade){
+     public String addDeptUser(SysUser sysUser,String grade){
          SysDept sysDept = sysDeptMapper.selectById(sysUser.getDeptId());
          SysDeptVo sysDeptVo = new SysDeptVo();
          sysDeptVo.setParentId(sysDept.getId());
@@ -3758,13 +3763,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
          sysDeptVo.setProvince(sysDept.getProvince()); // 默认省与负责人所在机构一样
          sysDeptVo.setCity(sysDept.getCity()); // 默认市与负责人所在机构一样
          sysDeptVo.setArea(sysDept.getArea()); // 默认区县与负责人所在机构一样
-         if (StringUtils.equals("4",String.valueOf(Integer.valueOf(grade) + 1))){
-             sysDeptVo.setDeptType("D"); // 默认为子公司
+         if (StringUtils.equals("4",grade)){
+             sysDeptVo.setDeptType("C"); // 默认为子公司
              sysDeptVo.setName(sysUser.getName() + "（工作室）");
              sysDeptVo.setComlevel("5");
          }
-         if (StringUtils.equals("5",String.valueOf(Integer.valueOf(grade) + 1))){
-             sysDeptVo.setDeptType("M"); // 默认为子公司
+         if (StringUtils.equals("5",grade)){
+             sysDeptVo.setDeptType("D"); // 默认为子公司
              sysDeptVo.setName(sysUser.getName() + "团队"); // 以人名设置工作室名称
          }
          sysDeptVo.setManagementSource(sysUser.getDeptSource());
@@ -3774,7 +3779,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
          SysDept sysDept1 = new SysDept();
          BeanUtils.copyProperties(sysDeptVo,sysDept1);
          sysDeptMapper.insert(sysDept1);
-         sysUser.setDeptId(sysDeptVo1);
+         return sysDept1.getId();
      }
 
      public String queryDId(SysDeptVo sysDeptVo){

src/main/java/com/ydtech/modules/partner/dao/PartnerUserMapper.java

@@ -13,6 +13,7 @@ import com.ydtech.modules.partner.model.param.QueryVo;
 import com.ydtech.modules.partner.model.vo.*;
 import org.apache.ibatis.annotations.*;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -189,4 +190,6 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     @Select("SELECT max(grade) FROM partner_user WHERE user_id = #{userId}")
     Integer selectByUserIdMax(String referrerId);
 
+    @Select("SELECT dept_id FROM partner_user WHERE user_id = #{userId} AND grade = #{grade}")
+    String queryDeptIdByUserId(@Param("userId") String id,@Param("grade") Integer grade);
 }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -79,7 +79,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     @Autowired
     private PartnerRuleService partnerRuleService;
 
-    @Value("${newPartner.expireDays}")
+    @Value("${partner.expireDays}")
     private Long expireDays;
 
     @Override

src/main/java/com/ydtech/modules/partner/utils/TimedTaskUtils.java

@@ -49,7 +49,7 @@ public class TimedTaskUtils {
     @Autowired
     private PartnerExpiredCommissionMapper expiredCommissionMapper;
 
-    @Value("${newPartner.expireDays}")
+    @Value("${partner.expireDays}")
     private Integer expireDays;
 
     /**

src/main/resources/application-test.yml

@@ -583,5 +583,5 @@ lg-ip:
   dateServer: https://test.baoxianzhanggui.com/prod-api/system/record/receiveDistributeServices
   withdrawal: https://test.baoxianzhanggui.com/prod-api/withdrawal/record/acceptPushWithdrawalData
 #新合伙人配置佣金过期天数
-newPartner:
+partner:
   expireDays: 1