邀请队员免单券 活动跳转地址修改

yujian

2019-03-01 9dedfa92c34c92d42230e151766726a8e4a7806f

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

@@ -35,6 +35,7 @@
import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

@@ -52,6 +53,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;

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

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

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

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

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

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

@@ -71,6 +73,7 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

@@ -216,6 +219,9 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private AppVersionService appVersionService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

   private static final String EXTRACT_MAX_MONEY = "extract_max_money";

@@ -243,6 +249,12 @@
         // }

         // });

         if (find != null) {

            if (find.getState() != UserInfo.STATE_NORMAL) {

               out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER,

                     Constant.FORBIDDEN_USER_REASON_DESC));

               return;

            }



            // 邀请关系生效

            threeSaleSerivce.effective(find);

            // 重新计算用户等级

@@ -504,11 +516,34 @@
      BigDecimal fanliHB = user.getTotalHongBao();

      user.setTotalHongBao(fanliHB);



      UserInfo filterForClientUser = UserUtil.filterForClientUser(user);



      // 1.5.0 版本之后返回新的等级

      String version = acceptData.getVersion();

      if (version != null && version.trim().length() > 0) {

         int versionCode = Integer.parseInt(version);

         String platform = acceptData.getPlatform();



         AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");

         if (versionInfo != null) {

            int versionCode150 = versionInfo.getVersionCode();

            if (versionCode >= versionCode150) {

               UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId());

               if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {

                  String picture = userInfoExtra.getUserRank().getPicture();

                  String icon = userInfoExtra.getUserRank().getIcon();

                  filterForClientUser.setRankNamePicture(picture);

                  filterForClientUser.setRankIcon(icon);

               }

            }

         }

      }



      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();



      JSONObject data = new JSONObject();

      data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create()

            .toJson(UserUtil.filterForClientUser(user)));

      data.put("user",

            JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(filterForClientUser));

      data.put("first", 0);

      int spreadImgCount = spreadUserImgService.countUserSpreadImg(user.getId());

      long shareCount = userShareGoodsRecordService.countShareRecordByUid(user.getId());

@@ -557,11 +592,29 @@
      }



      data.put("moduleState", mySettings);



		
      int welfareCenterNews = 0;

      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());

      if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {

         welfareCenterNews = userInfoExtra.getCouponNews();

      }

      data.put("welfareCenterNews", welfareCenterNews);

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

		
      final UserInfo uuser = user;

      ThreadUtil.run(new Runnable() {

         public void run() {



            try {

               // 获取邀请码：若无邀请码且存在有效的队员关系 则自动生成邀请码

               userInfoExtraService.getUserInviteCode(uuser.getId());

            } catch (UserInfoExtraException e) {

               e.printStackTrace();

            }



            LogHelper.userInfo(GsonUtil.toJsonExpose(uuser));

            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

@@ -853,7 +906,7 @@
      }



      String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现的最小金额

      String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最大金额

      String maxDayMoney = configService.get("extract_money_day"); // 每日最大提现金额

      int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));

      ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);

      boolean canExtract = true;

@@ -862,9 +915,9 @@
         canExtract = false;

         errorMsg = String.format("每日最多提现%s次", maxDayCount + "");

      } else if (extractRecord != null

            && extractRecord.getMoney().add(money).compareTo(new BigDecimal(maxMoney)) > 0) {

            && extractRecord.getMoney().add(money).compareTo(new BigDecimal(maxDayMoney)) > 0) {

         canExtract = false;

         errorMsg = String.format("每日最多提现%s元", maxMoney);

         errorMsg = String.format("每日最多提现%s元", maxDayMoney);

      } else if (new BigDecimal(minMoney).compareTo(money) > 0) {

         canExtract = false;

         errorMsg = String.format("每次最低提现%s元", minMoney);

@@ -1255,6 +1308,12 @@
         HttpServletRequest request, int type, PrintWriter out) {

      UserInfo user = userInfoService.getUserById(uid);

      if (user == null) {

         user = userInfoService.getUserByIdWithMybatis(uid);

         if (user != null && user.getState() != UserInfo.STATE_NORMAL) {

            out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));

            return;

         }



         out.print(JsonUtil.loadFalseResult("用户不存在"));

         return;

      }

@@ -1804,28 +1863,91 @@
   @RequestMapping(value = "getMyTeam", method = RequestMethod.POST)

   public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {



      int pageSize = Constant.PAGE_SIZE;

      try {

         int pageSize = Constant.PAGE_SIZE;



      JSONObject resultData = new JSONObject();

      if (type == 1) {

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

      } else if (type == 2) {

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

         JSONObject resultData = new JSONObject();

         if (type == 1) {

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

         } else if (type == 2) {

            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 = "";

            }



            boolean hasCode = false;

            String inviteCode = userInfoExtraService.getUserInviteCode(uid);

            if (inviteCode != null && inviteCode.trim().length() > 0) {

               hasCode = true; // 已有邀请码

            } else {

               // 邀请激活链接

               resultData.put("activationlink", configService.get("invite_activation_url"));

            }

            resultData.put("hasCode", hasCode);



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

      } catch (UserInfoExtraException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

      }



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

      String platform = acceptData.getPlatform();

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

   }



   /**

    * 用户队员统计 1.4.1

    * 
    * @param acceptData

    * @param id

    * @param out

    */

   @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 secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

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



         JSONObject bossData = null;

         JSONObject bossData = new JSONObject();

         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

            bossData = new JSONObject();

            UserInfo boss = threeSale.getBoss();

            if (boss != null) {

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

@@ -1838,6 +1960,8 @@
            bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

         }



         JSONObject resultData = new JSONObject();



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

         if (helpLink == null) {

            helpLink = "";

@@ -1848,54 +1972,26 @@
         resultData.put("secondTeam", secondTeam);

         resultData.put("secondTeamTotal", secondTeamTotal);

         resultData.put("boss", bossData);

      }

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

   }



   /**

    * 用户队员统计 1.4.1

    * 
    * @param acceptData

    * @param id

    * @param out

    */

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

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



      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 = new JSONObject();

      ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

      if (threeSale != null) {

         UserInfo boss = threeSale.getBoss();

         if (boss != null) {

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

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

         boolean hasCode = false;

         String inviteCode = userInfoExtraService.getUserInviteCode(uid);

         if (inviteCode != null && inviteCode.trim().length() > 0) {

            hasCode = true; // 已有邀请码

         } else {

            // 邀请激活链接

            resultData.put("activationlink", configService.get("invite_activation_url"));

         }

         resultData.put("hasCode", hasCode);



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

         Long createTime = threeSale.getCreateTime();

         Date inviteTime = new Date(createTime);

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

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



      } catch (UserInfoExtraException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

      }



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

      resultData.put("secondTeamTotal", secondTeamTotal);

      resultData.put("boss", bossData);



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

   }



   /**