Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -114,6 +114,7 @@
   private IntegralDetailService integralDetailService;

   



	
   /**

    * 查询用户信息列表 正常用户/异常用户

    * 

@@ -135,8 +136,8 @@
    */

   @RequestMapping(value = "query")

   public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,

         Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {



         Integer days, String startTime, String endTime, Integer orderMode, Integer type,String level,

         Integer activeCode, PrintWriter out) {

      try {

         if (type == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户类型type不能为空"));

@@ -184,14 +185,14 @@
         }



         List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,

               userRank, days, startTime, endTime, orderField, orderMode,userType);

               userRank, days, startTime, endTime, orderField, orderMode,userType, level, activeCode);



         if (userList == null || userList.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无相关数据"));

            return;

         }



         long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType);

         long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -203,9 +204,7 @@
         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("resultList", gson.toJson(userList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

@@ -289,9 +288,7 @@
         long monthUser = userInfoCountService.countNewUser(null, 1);

         data.put("todayUser", todayUser);

         data.put("monthUser", monthUser);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

@@ -416,7 +413,6 @@
   @RequestMapping(value = "deleteUser")

   public void delete(String callback, String idArray, HttpServletRequest request,  PrintWriter out) {

      try {

			
         AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

         if (admin == null) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("当前账户失效,请重新登陆。")));

@@ -460,7 +456,6 @@
   @RequestMapping(value = "forbiddenUser")

   public void forbiddenUser(String callback, Long uid, HttpServletRequest request, PrintWriter out) {

      try {



         if (uid == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

            return;

@@ -480,9 +475,7 @@


         String reason = "后台封禁，操作人：" + admin.getId() + "-" + admin.getName();

         userAccountService.forbiddenUserAll(uid, reason);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("用户封禁成功"));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

@@ -499,7 +492,6 @@
   @RequestMapping(value = "relieveForbiddenUser")

   public void relieveForbiddenUser(String callback, Long uid, PrintWriter out) {

      try {



         if (uid == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

            return;

@@ -546,9 +538,7 @@
                  forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

            }

         }



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("用户解封成功"));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

@@ -573,9 +563,7 @@
         }



         forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("修改成功"));



      } catch (ForbiddenUserIdentifyCodeException e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -585,157 +573,7 @@
      }

   }



   /**

    * 删除队员关系

    * 
    * @param callback

    * @param id

    * @param out

    */

   @RequestMapping(value = "deleteThreeSale")

   public void deleteThreeSale(String callback, Long id, PrintWriter out) {

      try {



         if (id == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

            return;

         }



         int count = threeSaleService.deleteByPrimaryKey(id);



         if (count > 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("删除成功"));

         } else {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         }



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

      }

   }



   @RequestMapping(value = "queryMyFirstTeams")

   public void queryMyFirstTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,

         PrintWriter out) {

      try {



         if (bossId == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

            return;

         }



         if (pageIndex == null)

            pageIndex = 1;



         if (pageSize == null)

            pageSize = Constant.PAGE_SIZE;



         List<ThreeSale> firstTeamList = threeSaleService.queryMyFirstTeamList((pageIndex - 1) * pageSize, pageSize,

               key, bossId);

         if (firstTeamList == null || firstTeamList.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无一度队员"));

            return;

         }



         /* 获取邀请用户头像 、昵称 */

         for (ThreeSale threeSale : firstTeamList) {

            UserInfo worker = threeSale.getWorker();

            if (worker == null) {

               worker = new UserInfo();

               threeSale.setWorker(worker);

            } else {

               Long id = worker.getId();



               UserInfo currentInfo = userInfoService.selectByPKey(id);

               if (currentInfo != null) {

                  worker.setNickName(currentInfo.getNickName());

                  worker.setPortrait(currentInfo.getPortrait());

               }

            }

         }



         long count = threeSaleService.queryCountMyFirstTeamList(key, bossId);



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         Gson gson = gsonBuilder.create();



         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("list", gson.toJson(firstTeamList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

      }

   }



   @RequestMapping(value = "queryMySecondTeams")

   public void queryMySecondTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,

         PrintWriter out) {

      try {



         if (bossId == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

            return;

         }



         if (pageIndex == null)

            pageIndex = 1;



         if (pageSize == null)

            pageSize = Constant.PAGE_SIZE;



         List<ThreeSale> firstTeamList = threeSaleService.queryMySecondTeamList((pageIndex - 1) * pageSize, pageSize,

               key, bossId);

         if (firstTeamList == null || firstTeamList.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无二度队员"));

            return;

         }



         /* 获取邀请用户头像 、昵称 */

         for (ThreeSale threeSale : firstTeamList) {

            UserInfo worker = threeSale.getWorker();

            if (worker == null) {

               worker = new UserInfo();

               threeSale.setWorker(worker);

            } else {

               Long id = worker.getId();



               UserInfo currentInfo = userInfoService.selectByPKey(id);

               if (currentInfo != null) {

                  worker.setNickName(currentInfo.getNickName());

                  worker.setPortrait(currentInfo.getPortrait());

               }

            }

         }



         long count = threeSaleService.queryCountMySecondTeamList(key, bossId);



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         Gson gson = gsonBuilder.create();



         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("list", gson.toJson(firstTeamList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

      }

   }

	 


   /**

    * 队员关系

@@ -749,7 +587,7 @@
    */

   @RequestMapping(value = "getRelationList")

   public void getRelationList(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer type,

         Integer state, String startTime, String endTime, PrintWriter out) {

         Integer state, String startTime, String endTime, Integer validState, PrintWriter out) {



      if (pageIndex == null || pageIndex < 1) {

         pageIndex = 1;

@@ -781,11 +619,11 @@
         } else if (type == 1) {

            // 一级用户

            listQuery = threeSaleService.listFirstTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,

                  startTime, endTime);

                  startTime, endTime, validState);

         } else if (type == 2) {

            // 二级用户

            listQuery = threeSaleService.listSecondTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,

                  startTime, endTime);

                  startTime, endTime, validState);

         }



         if (listQuery == null || listQuery.size() == 0) {

@@ -794,6 +632,14 @@
         }



         for (ThreeSale threeSale : listQuery) {

            // 用户信息

            UserInfo boss = threeSale.getBoss();

            threeSale.setBoss(userInfoService.selectByPKey(boss.getId()));

				
            UserInfo worker = threeSale.getWorker();

            threeSale.setWorker(userInfoService.selectByPKey(worker.getId()));

				
				
            Integer expire = threeSale.getExpire();

            if (threeSale.getState()) {

               threeSale.setExpire(1); // 邀请成功

@@ -805,6 +651,7 @@
               }

            }

         }

			


         long count = 0;

         if (type == 0) {

@@ -812,10 +659,10 @@
            count = threeSaleService.countSuperiorQuery(state, uid);

         } else if (type == 1) {

            // 一级用户

            count = threeSaleService.countFirstTeamQuery(uid, state, startTime, endTime);

            count = threeSaleService.countFirstTeamQuery(uid, state, startTime, endTime, validState);

         } else if (type == 2) {

            // 二级用户

            count = threeSaleService.countSecondTeamQuery(uid, state, startTime, endTime);

            count = threeSaleService.countSecondTeamQuery(uid, state, startTime, endTime, validState);

         }



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

@@ -874,9 +721,7 @@
         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", gson.toJson(userMoneyDetailsList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));