推送 改为 推荐

Administrator

2018-12-03 b99f5f5ac42b8346fade48ba7cd119ca85bfdab1

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -1609,6 +1609,43 @@
         resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);

      } 

      

      // 安卓系统返回所有数据

      String platform = acceptData.getPlatform();

      if ("android".equalsIgnoreCase(platform)) {

         long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);

         long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);

			
         long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

         long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);

			
         JSONObject bossData = null;

         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

            bossData = new JSONObject();

            UserInfo boss = threeSale.getBoss();

            if (boss != null) {

               bossData.put("nickName", boss.getNickName());

               bossData.put("portrait", boss.getPortrait());

            }

				
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

            Long createTime = threeSale.getCreateTime();

            Date inviteTime = new Date(createTime);

            bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

         }

			
         String helpLink = configService.get("team_help_url");

         if (helpLink == null) {

            helpLink = "";

         }

         resultData.put("helpLink", helpLink);

         resultData.put("firstTeam", firstTeam);

         resultData.put("firstTeamTotal", firstTeamTotal);

         resultData.put("secondTeam", secondTeam);

         resultData.put("secondTeamTotal", secondTeamTotal);

         resultData.put("boss", bossData);

      }

	
      out.print(JsonUtil.loadTrueResult(resultData));

   }

   

@@ -1627,25 +1664,30 @@
      long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

      long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);

      

      JSONObject bossData = new JSONObject();

      JSONObject bossData = null;

      ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

      if (threeSale != null) {

			
         bossData = new JSONObject();

         UserInfo boss = threeSale.getBoss();

         if (boss != null) {

            bossData.put("nickName", boss.getNickName());

            bossData.put("portrait", boss.getPortrait());

         }

         

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

         Long createTime = threeSale.getCreateTime();

         Date inviteTime = new Date(createTime);

         bossData.put("inviteTime", "邀请时间:" + sdf.format(inviteTime));

         bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

      }

      

      

      JSONObject resultData = new JSONObject();

      

      String helpLink = configService.get("team_help_url");

      if (helpLink == null) {

         helpLink = "";

      }

      resultData.put("helpLink", helpLink);

      resultData.put("firstTeam", firstTeam);

      resultData.put("firstTeamTotal", firstTeamTotal);

      resultData.put("secondTeam", secondTeam);

@@ -1664,41 +1706,49 @@
    * @param out

    */

   @RequestMapping(value = "setextrainfo", method = RequestMethod.POST)

   public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String nickname, PrintWriter out) {

   public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {

      

      List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);

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

         out.print(JsonUtil.loadFalseResult("该记录不存在"));

         return;

      try {

         List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);

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

            out.print(JsonUtil.loadFalseResult("该记录不存在"));

            return;

         }

			
         UserInfo worker = listThreeSale.get(0).getWorker();

         if (worker == null) {

            out.print(JsonUtil.loadFalseResult("该记录不存在"));

            return;

         }

			
         List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());

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

				
            ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();

            extraInfo.setWorker(worker);

            extraInfo.setNickname(memoName);

            extraInfo.setCreateTime(new Date());

            extraInfo.setUpdateTime(new Date());

				
            UserInfo boss = new UserInfo(uid);

            extraInfo.setBoss(boss);

				
            threeSaleExtraInfoSerivce.insert(extraInfo);

				
         } else {

            ThreeSaleExtraInfo extraInfo = list.get(0);

            extraInfo.setNickname(memoName);

            extraInfo.setUpdateTime(new Date());

            threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);

         }

			
         out.print(JsonUtil.loadTrueResult("保存成功"));

			
      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("保存失败"));

         e.printStackTrace();

      }

      

      UserInfo worker = listThreeSale.get(0).getWorker();

      if (worker == null) {

         out.print(JsonUtil.loadFalseResult("该记录不存在"));

         return;

      }

		
      List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());

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

			
         ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();

         extraInfo.setWorker(worker);

         extraInfo.setNickname(nickname);

         extraInfo.setCreateTime(new Date());

         extraInfo.setUpdateTime(new Date());

			
         UserInfo boss = new UserInfo(uid);

         extraInfo.setBoss(boss);

			
         threeSaleExtraInfoSerivce.insert(extraInfo);

			
      } else {

         ThreeSaleExtraInfo extraInfo = list.get(0);

         extraInfo.setNickname(nickname);

         threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);

      }

		
      out.print(JsonUtil.loadTrueResult("修改成功"));

   }

   

   /**

@@ -1710,25 +1760,30 @@
    */

   @RequestMapping(value = "removethreesale", method = RequestMethod.POST)

   public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {

      try {

         List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);

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

            out.print(JsonUtil.loadFalseResult("操作数据无效"));

            return;

         }

			
         UserInfo worker = listThreeSale.get(0).getWorker();

         if (worker == null) {

            out.print(JsonUtil.loadFalseResult("操作数据无效"));

            return;

         }

			
         // 删除关系

         threeSaleSerivce.deleteByPrimaryKey(inviteId);

         // 删除备注

         threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());

      

      List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);

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

         out.print(JsonUtil.loadFalseResult("操作失败"));

         return;

         out.print(JsonUtil.loadTrueResult("删除成功"));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }

      

      UserInfo worker = listThreeSale.get(0).getWorker();

      if (worker == null) {

         out.print(JsonUtil.loadFalseResult("操作失败"));

         return;

      }

		
      // 删除关系

      threeSaleSerivce.deleteByPrimaryKey(inviteId);

      // 删除备注

      threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());

	
      out.print(JsonUtil.loadTrueResult("操作成功"));

   }

   

}