返回添加代理商的用户id

pom.xml

@@ -138,10 +138,10 @@
             <properties>
                 <profiles.active>dev</profiles.active>
                 <mysql.server>jdbc:mysql://10.9.121.204:3306/huhu</mysql.server>
-                <!--<mysql.username>yanfa</mysql.username>-->
-                <!--<mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password>-->
-                <mysql.username>apihu</mysql.username>
-                <mysql.password>tqH9clYRAxZ@LV4x</mysql.password>
+                <mysql.username>yanfa</mysql.username>
+                <mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password>
+                <!--<mysql.username>apihu</mysql.username>-->
+                <!--<mysql.password>tqH9clYRAxZ@LV4x</mysql.password>-->
                 <redis.host>10.9.186.167</redis.host>
                 <redis.password>passwdredis</redis.password>
                 <spring.profiles.active>dev</spring.profiles.active>

src/main/java/com/lanren/huhu/partner/manager/PartnerAccountManager.java

-package com.lanren.huhu.partner.manager;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import com.lanren.huhu.partner.service.PartnerAccountService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
 * @author houseme
 * @date 2019-06-26 10:56
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: PartnerAccountManager
 */@Componentpublic class PartnerAccountManager {
    private static Logger logger = LoggerFactory.getLogger(PartnerAccountManager.class);

    @Autowired
    private PartnerAccountService partnerAccountService;

    /***
     * 获取合伙人账户信息
     * @param userId
     * @return
     */
    public Result<PartnerAccount> findByUserId(Integer userId) {
        Result<PartnerAccount> result = new Result<>();
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager findByUserId userId:{},time:{}", userId, LocalDateTime.now());
        }
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        logger.info("findByUserId {}", partnerAccount);
        result.setData(partnerAccount);
        return result;
    }

    /***
     * 获取合伙人等级 10 普通, 20 高级, 30 超级
     * @param userId
     * @return
     */
    public Result<PartnerRsp> getPartnerLevel(Integer userId) {
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager getPartnerLevel userId:{},time:{}", userId, LocalDateTime.now());
        }
        Result<PartnerRsp> result = new Result<>();
        int partnerLevel;
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        if (null != partnerAccount) {
            if (partnerAccount.getIsSuperPartner() == 1) {
                partnerLevel = 30;
            } else {
                partnerLevel = partnerAccount.getPartnerLevel();
            }
        } else {
            partnerLevel = -1;
            result.setCode(60404);
        }
        result.setData(new PartnerRsp(partnerLevel));
        return result;
    }}
\ No newline at end of file
+package com.lanren.huhu.partner.manager;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import com.lanren.huhu.partner.service.PartnerAccountService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
 * @author houseme
 * @date 2019-06-26 10:56
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: PartnerAccountManager
 */@Componentpublic class PartnerAccountManager {
    private static Logger logger = LoggerFactory.getLogger(PartnerAccountManager.class);

    @Autowired
    private PartnerAccountService partnerAccountService;

    /***
     * 获取合伙人账户信息
     * @param userId
     * @return
     */
    public Result<PartnerAccount> findByUserId(Integer userId) {
        Result<PartnerAccount> result = new Result<>();
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager findByUserId userId:{},time:{}", userId, LocalDateTime.now());
        }
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        logger.info("findByUserId {}", partnerAccount);
        result.setData(partnerAccount);
        return result;
    }

    /***
     * 获取合伙人等级 10 普通, 20 高级, 30 超级
     * @param userId
     * @return
     */
    public Result<PartnerRsp> getPartnerLevel(Integer userId) {
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager getPartnerLevel userId:{},time:{}", userId, LocalDateTime.now());
        }
        Result<PartnerRsp> result = new Result<>();
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        if (null != partnerAccount) {
            int partnerLevel;
            if (partnerAccount.getIsSuperPartner() == 1) {
                partnerLevel = 30;
            } else {
                partnerLevel = partnerAccount.getPartnerLevel();
            }
            result.setData(new PartnerRsp(partnerLevel));
        } else {
            result.setCode(601);
        }
        return result;
    }}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/manager/UserAgentManager.java

@@ -33,14 +33,11 @@ public class UserAgentManager {
         }
         Result<AgentRsp> result = new Result<>();
         UserAgent userAgent = userAgentService.getOneByAgentId(agentId);
-        int agentLevel;
         if (null != userAgent) {
-            agentLevel = userAgent.getAgentLevel();
+            result.setData(new AgentRsp(userAgent.getUserId(), userAgent.getAgentLevel()));
         } else {
-            agentLevel = -1;
             result.setCode(601);
         }
-        result.setData(new AgentRsp(agentLevel));
         return result;
     }
 }

src/main/java/com/lanren/huhu/partner/manager/UserManager.java

@@ -106,7 +106,7 @@ public class UserManager {
                      * 然后开始 无限找 这个人的上级代理商
                      */
                     logger.info("find first agent({}) for user: {}", userAgent.getAgentId(), user.getUserId());
-                    user.getAgentList().add(new ParentAgent(userAgent.getAgentId(), userAgent.getAgentLevel()));
+                    user.getAgentList().add(new ParentAgent(userAgent.getUserId(), userAgent.getAgentId(), userAgent.getAgentLevel()));
                     logger.info("loop find parent agent start ......");
                     int loogAgentId = userAgent.getAgentId();
                     while (true) {
@@ -115,7 +115,7 @@ public class UserManager {
                             break;
                         } else {
                             logger.info("parent agent is ", loopUserAgent.getAgentId());
-                            user.getAgentList().add(new ParentAgent(loopUserAgent.getAgentId(), loopUserAgent.getLevel()));
+                            user.getAgentList().add(new ParentAgent(loopUserAgent.getUserId(), loopUserAgent.getAgentId(), loopUserAgent.getLevel()));
                             loogAgentId = loopUserAgent.getAgentId();
                         }
                     }
@@ -166,7 +166,7 @@ public class UserManager {
         ParentAgent parentAgent = null;
         if (null != userAgent) {
             int agentLevel = userAgent.getAgentLevel();
-            parentAgent = new ParentAgent(userAgent.getAgentId(), agentLevel);
+            parentAgent = new ParentAgent(userAgent.getUserId(), userAgent.getAgentId(), agentLevel);
         }
         return parentAgent;
     }

src/main/java/com/lanren/huhu/partner/model/AgentRsp.java

@@ -5,9 +5,11 @@ import lombok.Data;
 
 @Data
 public class AgentRsp extends BaseModel {
+    int userId;
     int level;
 
-    public AgentRsp(int level) {
+    public AgentRsp(int userId, int level) {
+        this.userId = userId;
         this.level = level;
     }
 }

src/main/java/com/lanren/huhu/partner/model/ParentAgent.java

@@ -13,10 +13,12 @@ import lombok.Data;
  */
 @Data
 public class ParentAgent extends BaseModel {
+    int userId;
     int agentId;
     int level;
 
-    public ParentAgent(int agentId, int level) {
+    public ParentAgent(int userId, int agentId, int level) {
+        this.userId = userId;
         this.agentId = agentId;
         this.level = level;
     }

src/main/java/com/lanren/huhu/partner/model/User.java

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.io.Serializable;
 import java.util.ArrayList;
 
 /**