冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

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

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

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.dto.money.AccountDetails;

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;

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

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

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

            // 重新计算用户等级

@@ -586,10 +593,26 @@


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

@@ -881,7 +904,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;

@@ -890,9 +913,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);

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

      }

@@ -1834,7 +1863,7 @@


      try {

         int pageSize = Constant.PAGE_SIZE;

 


         JSONObject resultData = new JSONObject();

         if (type == 1) {

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

@@ -1941,12 +1970,11 @@
         resultData.put("secondTeam", secondTeam);

         resultData.put("secondTeamTotal", secondTeamTotal);

         resultData.put("boss", bossData);

			
			


         boolean hasCode = false;

         String inviteCode = userInfoExtraService.getUserInviteCode(uid);

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

            hasCode = true;   // 已有邀请码

            hasCode = true; // 已有邀请码

         } else {

            // 邀请激活链接

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

@@ -1954,14 +1982,14 @@
         resultData.put("hasCode", hasCode);



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

			


      } catch (UserInfoExtraException e) {

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

      } catch (Exception e) {

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

         e.printStackTrace();

      }

		


   }



   /**