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

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

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

@@ -107,6 +107,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

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

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

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

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

@@ -253,6 +254,11 @@


   @Resource

   private UserInviteService userInviteService;

	
   @Resource

   private TeamFansInfoService teamFansInfoService;



	


   private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();

   private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();

@@ -1679,19 +1685,17 @@


         JSONObject resultData = new JSONObject();

         if (type == 1) {

            resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, null);

            resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);

         } else if (type == 2) {

            resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, null);

            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 firstTeam = threeSaleSerivce.countFirstTeam(uid);



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

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

            long secondTeam = threeSaleSerivce.countSecondTeam(uid);



            JSONObject bossData = null;

            ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

@@ -1726,9 +1730,9 @@


            resultData.put("helpLink", helpLink);

            resultData.put("firstTeam", firstTeam);

            resultData.put("firstTeamTotal", firstTeamTotal);

            resultData.put("firstTeamTotal", firstTeam);

            resultData.put("secondTeam", secondTeam);

            resultData.put("secondTeamTotal", secondTeamTotal);

            resultData.put("secondTeamTotal", secondTeam);

            resultData.put("boss", bossData);

         }

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

@@ -1754,17 +1758,17 @@


         JSONObject resultData = new JSONObject();

         if (type == 1) {

            resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, 1);

            resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);

         } else if (type == 2) {

            resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, 1);

            resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);

         }



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

         String platform = acceptData.getPlatform();

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

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

            long firstTeam = threeSaleSerivce.countFirstTeam(uid);



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

            long secondTeam = threeSaleSerivce.countSecondTeam(uid);



            JSONObject bossData = null;

            ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

@@ -1819,11 +1823,9 @@
   @RequestMapping(value = "countMyTeam", method = RequestMethod.POST)

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

      try {

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

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

         long firstTeam = threeSaleSerivce.countFirstTeam(uid);



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

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

         long secondTeam = threeSaleSerivce.countSecondTeam(uid);

         JSONObject bossData = new JSONObject();

         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

@@ -1847,9 +1849,9 @@
         }

         resultData.put("helpLink", helpLink);

         resultData.put("firstTeam", firstTeam);

         resultData.put("firstTeamTotal", firstTeamTotal);

         resultData.put("firstTeamTotal", firstTeam);

         resultData.put("secondTeam", secondTeam);

         resultData.put("secondTeamTotal", secondTeamTotal);

         resultData.put("secondTeamTotal", secondTeam);

         resultData.put("boss", bossData);



         boolean hasCode = false;

@@ -1882,21 +1884,33 @@
    */

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

   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) {

      ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);

      if (threeSale == null) {

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

         return;

      }



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

      UserInfo worker = threeSale.getWorker();

      if (worker == null) {

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

         return;

      }



		
      int type = 1;

      if (threeSale.getBoss().getId() != uid) {

         type = 2;

      }

		
      ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());

      if (extraInfo == null) {

         extraInfo = new ThreeSaleExtraInfo();

         Long bossUid = threeSale.getBoss().getId();

         if (uid == bossUid) {

            extraInfo.setType(1); // 直接

         } else {

            extraInfo.setType(2); // 间接

         }

			
         extraInfo.setWorker(worker);

         extraInfo.setNickname(memoName);

         extraInfo.setCreateTime(new Date());

@@ -1910,44 +1924,13 @@
         updateInfo.setUpdateTime(new Date());

         threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);

      }

		
      // 更新粉丝记录信息

      teamFansInfoService.updateMemoName(worker.getId(), type, memoName);

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

   }



   /**

    * 删除队员关系

    * 
    * @param acceptData

    * @param uid

    * @param inviteId

    *            邀请id

    * @param out

    */

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



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

      } catch (Exception e) {

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

         e.printStackTrace();

      }

   }



   /**

    * 设置界面开关状态

@@ -2237,6 +2220,10 @@
            inviteLevel.put("link", level.getLink());

            data.put("inviteLevel", inviteLevel);

         }

			
         if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

            data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));

         }



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



@@ -2259,7 +2246,7 @@
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }