用户团队数据维护bug修改

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

@@ -9,8 +9,4 @@ public interface UserLevelService {
      */
     void userLevelUpgrade(String userId);
 
-    /**
-     * 用户升级定时任务
-     */
-    void userLevelUp();
 }

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

+package cn.wisenergy.service.app;
+
+public interface UserLevelTaskService {
+    /**
+     * 用户升级定时任务
+     */
+    void userLevelUp();
+
+    /**
+     * 用户升级月定时任务
+     */
+    void monthUserLevelUp();
+}

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

@@ -85,19 +85,81 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
         //3、上级用户的直推表数据维护
         recommendInfoDataPreserve(userId,userInvitedId);
         //4、用户的团队表数据维护
-        Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
+        //Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
         //4.1获取当前团队中最上级的用户对象
-        User highUser = highUser(userId);
-        if (null != highUser){
-            //4.2 最上级用户id
-            String highUserId = highUser.getUserId();
-            //4.1整体团队数据维护
-            teamData(teamDataMap, highUserId);
-        }
+//        User highUser = highUser(userId);
+//        if (null != highUser){
+//            //4.2 最上级用户id
+//            String highUserId = highUser.getUserId();
+//            //4.1整体团队数据维护
+//            teamData(teamDataMap, highUserId);
+//        }
+        //4、上级用户数据维护
+        teamDataPreserve(userId,userInvitedId);
+
         //5、查看当前用户是否要进行升级
         userLevelService.userLevelUpgrade(userInvitedId);
     }
 
+
+    /**
+     * 团队数据维护
+     * @param userId
+     * @param userInvitedId
+     */
+    private void teamDataPreserve(String userId, String userInvitedId) {
+
+        User userByUserId = usersMapper.getUserByUserId(userId);
+        int userLevel = userByUserId.getUserLevel();
+//        TeamUserInfo userTeamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId);
+//        Integer normalUserNum = userTeamUserInfoMapperByUserId.getNormalUserNum();
+//        Integer seedlingNum = userTeamUserInfoMapperByUserId.getSeedlingNum();
+//        Integer bronzeTreeNum = userTeamUserInfoMapperByUserId.getBronzeTreeNum();
+//        Integer silverTreeNum = userTeamUserInfoMapperByUserId.getSilverTreeNum();
+//        Integer goldTreeNum = userTeamUserInfoMapperByUserId.getGoldTreeNum();
+//        Integer farmerNum = userTeamUserInfoMapperByUserId.getFarmerNum();
+//        Integer forestStartNum = userTeamUserInfoMapperByUserId.getForestStartNum();
+//        Integer partnerNum = userTeamUserInfoMapperByUserId.getPartnerNum();
+
+        TeamUserInfo inviteTeamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userInvitedId);
+        if (null != inviteTeamUserInfoMapperByUserId){
+
+            if (0 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + 1 );
+            }else if (1 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + 1 );
+            }else if (2 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + 1 );
+            }else if (3 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + 1 );
+            }else if (4 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + 1 );
+            }else if (5 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + 1 );
+            }else if (6 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + 1 );
+            }else if (7 == userLevel){
+                inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + 1 );
+            }
+            teamUserInfoMapper.updateById(inviteTeamUserInfoMapperByUserId);
+
+            //推荐人的推荐人id
+            User invitedUserByUserId = usersMapper.getUserByUserId(userInvitedId);
+            if (null != invitedUserByUserId){
+                String beInvitedCode = invitedUserByUserId.getBeInvitedCode();
+                User user = usersMapper.getuserByBeInvitedCode(beInvitedCode);
+                if (null != user){
+                    String upUserId = user.getUserId();
+                    teamDataPreserve(userInvitedId,upUserId);
+                }
+            }
+
+        }
+
+
+
+    }
+
     /**
      * 直推数据维护
      * @param userId  当前用户id

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

@@ -59,23 +59,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
     private static final String sysInviteCode1 = "1";
     private static final String sysInviteCode2 = "88888888";
 
-    //获取订单
-    @XxlJob(value = "userLevelUpjobhandler")
-    @Override
-    public void userLevelUp() {
-        //1.获取数据库订单数据
-        log.info("------------------------用户升级开始----------------------------------");
-        List<OrderInfo> ordersByLevelStatus = orderMapper.getByLevelStatus(0);
-        for (OrderInfo orderInfo : ordersByLevelStatus) {
-            String userId = orderInfo.getUserId();
-            userLevelUpgrade(userId);
-            //当前订单升级状态置为1
-            orderInfo.setLevelStatus(1);
-            orderMapper.updateById(orderInfo);
-        }
-        log.info("-------------------------用户升级结束--------------------------------------");
-    }
-
     @Override
     @Transactional
     public void userLevelUpgrade(String userId) {
@@ -135,8 +118,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setSeedlingNum(inviteRecommendUser.getSeedlingNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoNormalToSeed(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoNormalToSeed(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 1;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
@@ -169,8 +152,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setBronzeTreeNum(inviteRecommendUser.getBronzeTreeNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoSeedToBronze(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoSeedToBronze(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 2;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
@@ -201,8 +184,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setSilverTreeNum(inviteRecommendUser.getSilverTreeNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoBronzeToSilver(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoBronzeToSilver(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 3;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
@@ -272,8 +255,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setGoldTreeNum(inviteRecommendUser.getFarmerNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoGoldTreeToFarmer(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoGoldTreeToFarmer(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 5;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
@@ -308,8 +291,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setForestStartNum(inviteRecommendUser.getForestStartNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoFarmerToForestStart(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoFarmerToForestStart(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 6;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
@@ -345,8 +328,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
                 inviteRecommendUser.setPartnerNum(inviteRecommendUser.getPartnerNum() + 1);
                 recommendUserMapper.updateById(inviteRecommendUser);
                 //团队用户表数据维护
-//                teamUserInfoForestStartToPartner(inviteUserId);
-                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
+                teamUserInfoForestStartToPartner(inviteUserId);
+//                aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
                 //上级用户获得幼苗等级的培育奖
                 int level = 7;
                 cultivatingPrizeToInvitedUser(userId, inviteUserId, level);

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

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.mapper.OrderMapper;
+import cn.wisenergy.model.app.OrderInfo;
+import cn.wisenergy.service.app.UserLevelService;
+import cn.wisenergy.service.app.UserLevelTaskService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class UserLevelTaskServiceImpl implements UserLevelTaskService {
+
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Autowired
+    private UserLevelService userLevelService;
+
+    //获取订单
+    @XxlJob(value = "userLevelUpjobhandler")
+    @Override
+    public void userLevelUp() {
+        //1.获取数据库订单数据
+        log.info("------------------------日定时任务+5分钟执行一次+用户升级开始----------------------------------");
+        List<OrderInfo> ordersByLevelStatus = orderMapper.getByLevelStatus(0);
+        for (OrderInfo orderInfo : ordersByLevelStatus) {
+            String userId = orderInfo.getUserId();
+            userLevelService.userLevelUpgrade(userId);
+            //当前订单升级状态置为1
+            orderInfo.setLevelStatus(1);
+            orderMapper.updateById(orderInfo);
+        }
+        log.info("-------------------------日定时任务+5分钟执行一次+用户升级结束--------------------------------------");
+    }
+
+    @XxlJob("monthUserLevelUpjobhandler")
+    @Override
+    public void monthUserLevelUp(){
+        //1.获取数据库订单数据
+        log.info("------------------------月定时任务：====用户升级开始----------------------------------");
+        List<OrderInfo> ordersByLevelStatus = orderMapper.getByMonthOrderStatus(0);
+        for (OrderInfo orderInfo : ordersByLevelStatus) {
+            String userId = orderInfo.getUserId();
+            userLevelService.userLevelUpgrade(userId);
+            //当前订单升级状态置为1
+            orderInfo.setLevelStatus(1);
+            orderMapper.updateById(orderInfo);
+        }
+        log.info("-------------------------月定时任务：====用户升级结束--------------------------------------");
+    }
+
+}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java

@@ -75,6 +75,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
         filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
         filterChainDefinitionMap.put("/userlevel/test","anon");
+        filterChainDefinitionMap.put("/customerService/uploadWeChatImg","anon");
+        filterChainDefinitionMap.put("/customerService/service","anon");
 
 
         filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低