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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

@@ -18,6 +19,10 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

import com.yeshi.fanli.dto.ChartTDO;

@@ -26,14 +31,15 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserActiveNumHistory;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.integral.IntegralDetail;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;

import com.yeshi.fanli.log.LogHelper;

@@ -47,6 +53,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

@@ -103,7 +110,11 @@
   @Resource

   private UserVIPInfoService userVIPInfoService;

   

   @Resource

   private IntegralDetailService integralDetailService;

	


	
   /**

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

    * 

@@ -125,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不能为空"));

@@ -174,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);

@@ -193,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("操作异常"));

@@ -279,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("操作异常"));

@@ -406,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("当前账户失效,请重新登陆。")));

@@ -450,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;

@@ -470,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("操作失败"));

@@ -489,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;

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

            }

         }



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



      } catch (Exception e) {

         e.printStackTrace();

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

@@ -563,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()));

@@ -575,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("操作异常"));

      }

   }

	 


   /**

    * 队员关系

@@ -739,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;

@@ -771,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) {

@@ -784,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); // 邀请成功

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

            }

         }

			


         long count = 0;

         if (type == 0) {

@@ -802,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);

@@ -864,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("查询失败"));

@@ -1241,113 +1096,51 @@
   

   

   /**

    * 计当天活跃用户中有多少个用户是90天前才活跃过，期间从未活跃的用户数量

    * 获取金币排行榜

    * @param callback

    * @param dateType

    * @param year

    * @param startTime

    * @param endTime

    * @param pageIndex

    * @param pageSize

    * @param type

    * @param out

    */

   @RequestMapping(value = "getUserActiveCharts")

   public void getUserActiveCharts(String callback, Integer dateType, String year, String startTime,

         String endTime, PrintWriter out){

      try {

         String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);

         if (validateMsg != null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));

            return;

         }

			
         if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {

            startTime = null;

            endTime = null;

         }



			
         Date beginDate = null;

         Date endDate = null;

			
         if (dateType == 1) {

            beginDate = TimeUtil.parse(startTime);

            endDate = TimeUtil.parse(endTime);

         } else if (dateType == 2) {

            Calendar calendar=Calendar.getInstance();  
            int currentYear = calendar.get(Calendar.YEAR);

            if (!StringUtil.isNullOrEmpty(year)) {

               currentYear = Integer.parseInt(year);

            }

				
            calendar.clear();

             calendar.set(Calendar.YEAR, currentYear);

             beginDate =calendar.getTime();

   @RequestMapping(value = "getGoldCoinRecord")

   public void getGoldCoinRecord(String callback, Integer pageIndex, Integer pageSize, String key,   PrintWriter out) {

      if (pageIndex == null)

         pageIndex = 1;

      

            calendar.clear();

            calendar.set(Calendar.YEAR, currentYear);

            calendar.roll(Calendar.DAY_OF_YEAR, -1);

            endDate=calendar.getTime(); 
         } else if (dateType == 3) {

            beginDate = TimeUtil.parse("2018-01-01");

            endDate = new Date();

         }

         Gson gson = new Gson();

         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);

			
         List<Object> list = new ArrayList<>();

         List<UserActiveNumHistory> listHistory = userActiveLogService.query(beginDate, endDate);

         for (String date: dateList) {

            ChartTDO chartTDO = new ChartTDO();

            chartTDO.setShowDate(date);

            int value = 0;

				
            if (listHistory != null) {

               for (UserActiveNumHistory history: listHistory) {

                  if (dateType == 1) {

                     String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());

                     if (gernalTime.equalsIgnoreCase(date)) {

                        value += history.getNum();

                        continue;

                     }

                  } else if (dateType == 2){

                     String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());

                     if(gernalTime.startsWith("0")) {

                        gernalTime = gernalTime.substring(1, 2);

                     }

                     if (gernalTime.equalsIgnoreCase(date)) {

                        value += history.getNum();

                        continue;

                     }

                  } else if (dateType == 3) {

                     String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());

                     if (gernalTime.equalsIgnoreCase(date)) {

                        value += history.getNum();

                        continue;

                     }

                  }

               }

            }

				
            chartTDO.setShowValue(value + "");

            list.add(value + "");

         }

			
         JSONObject innerList = new JSONObject();

         innerList.put("name", "数量");

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



         JSONArray line_list = new JSONArray();

         line_list.add(innerList);



         JSONObject data = new JSONObject();

         data.put("xAxis_list", gson.toJson(dateList));

         data.put("line_list", line_list);

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

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("系统异常"));

         e.printStackTrace();

      if (pageSize == null)

         pageSize = 20;

		
      List<IntegralDetail> list = integralDetailService.listQuery((pageIndex-1)* pageSize, pageSize, key);

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

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无相关信息"));

         return;

      }

		
      for (IntegralDetail integralDetail: list) {

         Long uid = integralDetail.getUid();

         UserInfo userInfo = userInfoService.getUserById(uid);

         if (userInfo != null) {

            integralDetail.setNickName(userInfo.getNickName());

            integralDetail.setPortrait(userInfo.getPortrait());

         }

      }

		
      long count = integralDetailService.countQuery(key);

      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.setDateFormat("yyyy/MM/dd HH:mm:ss").create();

		


      JSONObject data = new JSONObject();

      data.put("pe", pe);

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

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

   }

	
   

   

   /**

@@ -1450,4 +1243,71 @@
      }

   }



	
	
   /**

    * 用户账户明细

    * 
    * @param callback

    * @param pageIndex

    * @param pageSize

    * @param id

    * @param out

    */

   @RequestMapping(value = "getMoneyDetails")

   public void getMoneyDetails(String callback, Integer pageIndex, String key, Integer keyType, PrintWriter out) {

      if (pageIndex == null) {

         pageIndex = 1;

      }

      int pageSize = Constant.PAGE_SIZE;

      try {

         List<UserMoneyDetail> list = userMoneyDetailService.listQuery(pageIndex, pageSize, key, keyType);

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

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

            return;

         }

			
         for (UserMoneyDetail detail: list) {

            UserInfo userInfo = detail.getUserInfo();

            if (userInfo == null) {

               detail.setUserInfo(new UserInfo());

               continue;

            }

				
				
            UserInfo user = userInfoService.selectByPKey(userInfo.getId());

            if (user != null) {

               detail.setUserInfo(user);

            }

         }



         long count = userMoneyDetailService.countQuery(key, keyType);



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

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



			
         GsonBuilder gsonBuilder = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss");

         gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new JsonSerializer<UserMoneyDetailTypeEnum>() {

            @Override

            public JsonElement serialize(UserMoneyDetailTypeEnum value, Type theType, JsonSerializationContext context) {

               if (value == null) {

                  return new JsonPrimitive("");

               } else {

                  return new JsonPrimitive(value.getDesc());

               }

            }

         });

         Gson gson = gsonBuilder.create();

			 
			
         JSONObject data = new JSONObject();

         data.put("pe", pe);

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

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

      } catch (Exception e) {

         e.printStackTrace();

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

      }

   }

}