Merge remote-tracking branch 'origin/master'

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

@@ -214,4 +214,18 @@ public interface UsersMapper extends BaseMapper<User> {
      * @return
      */
     User getuserByBeInvitedCode(String beInvitedCode);
+
+    /**
+     * 获取在团队中处于同一位置的用户集合
+     * @param beInvitedCode
+     * @return
+     */
+    List<User> getListUserByBeInvitedCode(String beInvitedCode);
+
+    /**
+     * 通过邀请码获取用户信息
+     * @param inviteCode
+     * @return
+     */
+    User getUserByInviteCode(String inviteCode);
 }

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

@@ -411,4 +411,22 @@
         invite_code = #{be_invited_code}
     </select>
 
+    <select id="getListUserByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        be_invited_code = #{be_invited_code}
+    </select>
+
+    <select id="getUserByInviteCode" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        invite_code = #{inviteCode}
+    </select>
+
 </mapper>

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

@@ -7,4 +7,11 @@ public interface AerialDeliveryUserService {
      * 空投池用户随机分配推荐人邀请码
      */
     void aerialDeliveryUserRand();
+
+    /**
+     * 设置邀请码接口
+     * @param userId  当前用户id
+     * @param userInvitedId  推荐人用户id
+     */
+    void userSetBeinviteCode(String userId, String userInvitedId);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java

@@ -68,7 +68,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             orderMapper.updateById(orderInfo);
         }
         log.info("-------------------------用户升级结束--------------------------------------");
-
     }
 
     @Override