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

yujian

2019-03-01 9dedfa92c34c92d42230e151766726a8e4a7806f

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

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

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

            // 重新计算用户等级

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

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

      }