推荐人逻辑问题修改

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -64,7 +64,6 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         oneTempList.addAll(oneMap.get("list2"));
 
     }
-
     @Override
     public void addReferrer(String referrerId, String nextPK) {
         if(referrerId.equals(nextPK)) throw new SystemException("推荐人不能是自己");
@@ -72,7 +71,9 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         EsmUserReferrer referrer = getById(referrerId);
         EsmUserReferrer eur = new EsmUserReferrer();
 
+
         if (null == referrer) {
+            //推荐人是团队长的时候，先固定队长是首级
             eur.setId(referrerId);
             eur.setLevel(0);
             eur.setAffiliation(referrerId);
@@ -80,26 +81,25 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             eur.setReferrerId(referrerId);
             eur.setReferrerName(user.getName());
             esmUserReferrerService.save(eur);
+
+            //查询团队长的id，并将团队长作为推荐人
             referrer = getById(referrerId);
+            eur.setId(nextPK);
+            eur.setReferrerName(referrer.getReferrerName());
+            eur.setReferrerId(referrer.getReferrerId());
+            eur.setLevel(referrer.getLevel() + 1);
+            eur.setAffiliation(referrer.getAffiliation());
+            esmUserReferrerService.saveOrUpdate(eur);
+        }else{
+            //已经级联过的代理再作为推荐人的时候，推荐人是传入的推荐人信息
+            SysUser user = sysUserService.getById(referrerId);
+            eur.setId(nextPK);
+            eur.setReferrerId(referrerId);
+            eur.setReferrerName(user.getName());
+            eur.setLevel(referrer.getLevel() + 1);
+            eur.setAffiliation(referrer.getAffiliation());
+            esmUserReferrerService.saveOrUpdate(eur);
         }
-
-
-//        //上级推荐人信息
-//        EsmUserReferrer referrerSuperior = esmUserReferrerService.getById(referrer.getReferrerId());
-//        if (null != referrerSuperior) {
-//            referrer.setAffiliation(referrerSuperior.getAffiliation());
-//        }
-        eur.setId(nextPK);
-        eur.setReferrerName(referrer.getReferrerName());
-        eur.setReferrerId(referrer.getReferrerId());
-        eur.setLevel(referrer.getLevel() + 1);
-        eur.setAffiliation(referrer.getAffiliation());
-//        if (null != referrer) {
-//            eur.setLevel(referrer.getLevel() + 1);
-//        } else {
-//            eur.setLevel(1);
-//        }
-        esmUserReferrerService.saveOrUpdate(eur);
     }