空头池用户随机分配部分代码上传

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

@@ -180,7 +180,16 @@ public interface UsersMapper extends BaseMapper<User> {
 
     /**
      * 获取所有的空投用户
+     *              且注册时间为一月之前
      * @return
      */
-    List<User> getAerialDeliveryUser();
+    List<User> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
+                                                  @Param("now") String now );
+
+    /**
+     * 随机获取一条小于当前id的用户 即： 比当前用户早注册的用户
+     * @param id
+     * @return
+     */
+    User randOneGetUserByUserId(Integer id);
 }

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

@@ -368,13 +368,23 @@
         invite_code = #{outerUserId}
     </select>
 
-    <select id="getAerialDeliveryUser" resultType="cn.wisenergy.model.app.User">
+    <select id="getAerialDeliveryUserBeforOneMonth" resultType="cn.wisenergy.model.app.User">
         select
         <include refid="cols_all"/>
         from
         <include refid="table"/>
         where
-        be_invited_code = '1';
+        be_invited_code = '1'
+        and DATE_FORMAT(create_time,'%Y-%m-%d')
+            BETWEEN #{before} AND #{now}
+    </select>
+
+    <select id="randOneGetUserByUserId" resultType="cn.wisenergy.model.app.User" >
+        SELECT
+        <include refid="cols_all"/>
+         FROM <include refid="table"/>
+         WHERE id &lt; #{id}
+         ORDER BY RAND() LIMIT 1
     </select>
 
 </mapper>

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

 package cn.wisenergy.service.app;
 
 public interface UserLevelService {
+
+    /**
+     * 用户升级
+     *      根据用户的userid进行判断看当前用户是否需要进行升级
+     * @param userId 用户id
+     */
     void userLevelUpgrade(String userId);
+
+    /**
+     * 用户升级定时任务
+     */
     void userLevelUp();
 }

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

@@ -96,11 +96,4 @@ public interface UserService {
      */
     R<Boolean> fillInInviteCode(String userId, String inviteCode);
 
-    /**
-     * 空投池中用户随机分配任意邀请人
-     * 定时任务（日任务）
-     * 随机邀请人要求 1:注册时间早于当前用户
-     *              2；推荐人邀请码不能为1
-     */
-    public void AerialDeliveryUserRand();
 }

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

@@ -49,8 +49,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper,User> implemen
     @Autowired
     private OrderMapper orderMapper;
 
-
-//    public void
     //获取订单
     @XxlJob(value = "userLevelUpjobhandler")
     @Override
@@ -564,13 +562,13 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper,User> implemen
     /**
      * 培育奖给到上级用户
      *
-     * @param userid       当前用户id
+     * @param userId       当前用户id
      * @param inviteUserId 上级用户id
      * @param level        当前用户升级后的等级
      */
-    public void cultivatingPrizeToInvitedUser(String userid, String inviteUserId, int level) {
+    public void cultivatingPrizeToInvitedUser(String userId, String inviteUserId, int level) {
         //当前用户的培育奖记录
-        CultivatingPrizeInfo cultivatingPrizeInfo = cultivatingPrizeInfoMapper.getOneByUserId(userid);
+        CultivatingPrizeInfo cultivatingPrizeInfo = cultivatingPrizeInfoMapper.getOneByUserId(userId);
         if (1 == level) {
             int seedling = cultivatingPrizeInfo.getSeedling();
             //用户等级对应的培育奖金额

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

@@ -7,10 +7,12 @@ import cn.wisenergy.model.app.UsersDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
 import cn.wisenergy.model.vo.UserPoolVo;
 import cn.wisenergy.service.Manager.RegistUserMoudleInitManager;
+import cn.wisenergy.service.app.UserLevelService;
 import cn.wisenergy.service.app.UserService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.weaver.ast.Var;
@@ -334,23 +336,4 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         }
         return succ;
     }
-
-    /**
-     * 空投池中用户随机分配任意邀请人
-     * 定时任务（日任务）
-     * 随机分配条件（ 1：当前用户的推荐人邀请码是 “1”
-     * 2： 且当前用户的注册时间是一个月前）
-     * 随机邀请人要求 1:注册时间早于当前用户
-     * 2；推荐人邀请码不能为1
-     */
-//    @XxlJob()
-    @Override
-    public void AerialDeliveryUserRand() {
-        //查询空头池中的所有用户（即推荐人邀请码为 “1” 的用户）
-        List<User> aerialDeliveryUserList = usersMapper.getAerialDeliveryUser();
-        for (User user : aerialDeliveryUserList) {
-
-        }
-
-    }
 }