Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

pom.xml

@@ -40,7 +40,7 @@
         <module>wisenergy-service</module>
         <!--<module>wisenergy-shiro</module>-->
         <module>wisenergy-web-admin</module>
-        <module>wisenergy-system</module>
+
     </modules>
 
     <!--POM属性变量-->

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

 package cn.wisenergy.service.app;
 
-import org.springframework.stereotype.Service;
 
+/**
+ * @author 86187
+ */
 public interface AerialDeliveryUserService {
     /**
      * 空投池用户随机分配推荐人邀请码

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.Id;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -7,6 +7,7 @@ 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.AerialDeliveryUserService;
 import cn.wisenergy.service.app.UserLevelService;
 import cn.wisenergy.service.app.UserService;
 import com.alibaba.fastjson.JSONObject;
@@ -47,6 +48,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Autowired
     private RegistUserMoudleInitManager registUserMoudleInit;
 
+    @Autowired
+    private AerialDeliveryUserService aerialDeliveryUserService;
+
     @Autowired
     private RedisUtils redisUtils;
 
@@ -124,18 +128,18 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             String inviteCode = "0";
             beInvitedCode = "1";
             int userLevel = 0;
-            int frozen=0;
+            int frozen = 0;
             String headImage = Constants.Common.HEAD_POTRAIT;
-            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage,frozen);
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage, frozen);
             //初始化六张表
             registUserMoudleInit.registUserMoudleInit(userId);
         } else {
             //插入用户手机号与推荐人邀请码
             String inviteCode = "0";
             int userLevel = 0;
-            int frozen=0;
+            int frozen = 0;
             String headImage = Constants.Common.HEAD_POTRAIT;
-            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage,frozen);
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage, frozen);
             //初始化六张表
             registUserMoudleInit.registUserMoudleInit(userId);
             //用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
@@ -159,8 +163,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             int idbc = Integer.valueOf(idb);
 
             //获取注册用户的id
-            User use=  usersMapper.getByUserId(userId);
-            int ida =use.getId();
+            User use = usersMapper.getByUserId(userId);
+            int ida = use.getId();
 
             //判断被邀请用户的创建时间是否比推荐人的用户时间晚
             if (idbc > ida) {
@@ -178,14 +182,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
         //根据插入的用户手机号，查询用户唯一ID
 
-        if(null== usersMapper.getuserIdById(userId)|| "".equals(usersMapper.getuserIdById(userId))){
-            Map map =new HashMap();
-            map.put("code",1);
-            map.put("msg","该用户不存在！");
+        if (null == usersMapper.getuserIdById(userId) || "".equals(usersMapper.getuserIdById(userId))) {
+            Map map = new HashMap();
+            map.put("code", 1);
+            map.put("msg", "该用户不存在！");
             return map;
 
         }
-        long yqm=usersMapper.getuserIdById(userId);
+        long yqm = usersMapper.getuserIdById(userId);
         //用户唯一ID调用生成6位邀请码
         String inviteCode = ShareCodeUtil.idToCode(yqm);
         Integer userLevel = 0;
@@ -317,7 +321,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("推荐人不能是自己!");
         }
 
-        //4、设置用户被邀请码
+        //更新推荐用户的等级或者直推人数
+        aerialDeliveryUserService.userSetBeinviteCode(userId, userCode.getUserId());
+
+        //5、设置用户被邀请码
         user.setBeInvitedCode(inviteCode);
         int count = usersMapper.edit(user);
         if (count == 0) {