Merge remote-tracking branch 'origin/master'

platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java

@@ -226,9 +226,10 @@ public class TbCfUserInfoController {
         }
         Map<String, Object> result = new HashMap<>();
         TbCfUserInfoEntity parentUser = tbCfUserInfoService.queryObject(userId);
-        Network parent=new Network();
-        BeanUtils.copyProperties(parentUser,parent);
+        Network parent = new Network();
+        BeanUtils.copyProperties(parentUser, parent);
         parent.setNum(tbCfUserInfoService.getUserNetworkCount(params));
+        parent.setParentId(tbCfUserInfoService.getParentUser(userId));
         Query query = new Query(params);
         List<Network> networks = tbCfUserInfoService.getUserNetwork(query);
         int total = tbCfUserInfoService.getUserNetworkCount(query);

platform-admin/src/main/java/com/platform/dao/TbCfUserInfoDao.java

@@ -56,4 +56,6 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
     int getUserNetworkCount(Map<String, Object> params);
 
     BigDecimal getUserBonus(String userId);
+
+    String getParentUser(String userId);
 }

platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java

@@ -107,4 +107,6 @@ public interface TbCfUserInfoService {
     List<Network> getUserNetwork(Map<String, Object> params);
 
     int getUserNetworkCount(Map<String, Object> params);
+
+    String getParentUser(String userId);
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java

@@ -237,6 +237,11 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
         return tbCfUserInfoDao.getUserNetworkCount(params);
     }
 
+    @Override
+    public String getParentUser(String userId) {
+        return tbCfUserInfoDao.getParentUser(userId);
+    }
+
     /**
      * 编码文件名
      */

platform-admin/src/main/java/com/platform/vo/Network.java

@@ -19,6 +19,7 @@ public class Network {
     private String email;
     private String phone;
     private Integer num;
+    private String parentId;
 
 
     public String getUserId() {
@@ -85,4 +86,11 @@ public class Network {
         this.num = num;
     }
 
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml

@@ -357,4 +357,7 @@
         SELECT IFNULL(TRUNCATE(sum(amount),3),0) from bonus where user_info_user_id=#{userId}
     </select>
 
+    <select id="getParentUser" resultType="string">
+        SELECT user_info_user_id from network where network_info_user_id=#{userId}
+    </select>
 </mapper>