Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RecommendUserMapper.java

@@ -8,5 +8,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface RecommendUserMapper extends BaseMapper<RecommendUser> {
 
-
+    RecommendUser getByUserId(String userId);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamUserInfoMapper.java

@@ -9,4 +9,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TeamUserInfoMapper extends BaseMapper<TeamUserInfo> {
 
+    TeamUserInfo getByUserId(String userId);
 }

wisenergy-mapper/src/main/resources/mapper/RecommendUserMapper.xml

@@ -5,7 +5,6 @@
     <resultMap id="userMap" type="cn.wisenergy.model.app.RecommendUser">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
-        <result column="referrer_num" property="referrerNum"/>
         <result column="normal_user_num" property="normalUserNum"/>
         <result column="seedling_num" property="seedlingNum"/>
         <result column="bronze_tree_num" property="bronzeTreeNum"/>
@@ -28,17 +27,16 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,referrer_num,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
+        user_id,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
         gold_tree_num,farmer_num,forest_start_num,partner_num,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{referrerNum},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
+        #{userId},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
         #{goldTreeNum},#{farmerNum},#{forestStartNum},#{partnerNum},now(),now()
     </sql>
 
     <sql id="updateCondition">
-        <if test="referrerNum != null">referrer_num =#{referrerNum},</if>
         <if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
         <if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
         <if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
@@ -52,7 +50,6 @@
 
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
-        <if test="referrerNum != null">and referrer_num =#{referrerNum},</if>
         <if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
         <if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
         <if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
@@ -65,5 +62,14 @@
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
 
+    <select id="getByUserId" resultType="cn.wisenergy.model.app.RecommendUser">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            user_id=#{userId}
+        </where>
+    </select>
 
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/TeamUserInfoMapper.xml

@@ -5,7 +5,6 @@
     <resultMap id="userMap" type="cn.wisenergy.model.app.TeamUserInfo">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
-        <result column="team_members_num" property="teamMembersNum"/>
         <result column="normal_user_num" property="normalUserNum"/>
         <result column="seedling_num" property="seedlingNum"/>
         <result column="bronze_tree_num" property="bronzeTreeNum"/>
@@ -28,17 +27,16 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,team_members_num,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
+        user_id,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
         gold_tree_num,farmer_num,forest_start_num,partner_num,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{teamMembersNum},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
+        #{userId},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
         #{goldTreeNum},#{farmerNum},#{forestStartNum},#{partnerNum},now(),now()
     </sql>
 
     <sql id="updateCondition">
-        <if test="teamMembersNum != null">team_members_num =#{teamMembersNum},</if>
         <if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
         <if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
         <if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
@@ -52,7 +50,6 @@
 
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
-        <if test="teamMembersNum != null">and team_members_num =#{teamMembersNum},</if>
         <if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
         <if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
         <if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
@@ -65,5 +62,14 @@
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
 
+    <select id="getByUserId" resultType="cn.wisenergy.model.app.TeamUserInfo">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            user_id=#{userId}
+        </where>
+    </select>
 
 </mapper>
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/app/RecommendUser.java

@@ -31,12 +31,6 @@ public class RecommendUser implements Serializable {
     @ApiModelProperty(name = "userId", value = "用户id")
     private String userId;
 
-    /**
-     * 直推人数
-     */
-    @ApiModelProperty(name = "referrerNum", value = "直推人数")
-    private Integer referrerNum;
-
     /**
      * 普通用户数量
      */

wisenergy-model/src/main/java/cn/wisenergy/model/app/TeamUserInfo.java

@@ -31,12 +31,6 @@ public class TeamUserInfo implements Serializable {
     @ApiModelProperty(name = "userId", value = "用户id")
     private String userId;
 
-    /**
-     * 团队人数
-     */
-    @ApiModelProperty(name = "team_members_num", value = "团队人数")
-    private Integer teamMembersNum;
-
     /**
      * 普通用户数量
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelService.java

+package cn.wisenergy.service.app;
+
+public interface UserLevelService {
+    void userLevelUpgrade(String userId);
+}