邀请电话号为空不为null 返回msg提示

yujian

2019-01-24 c7052daa68c6f9a4141f501dec03d8f64fcd4a8a

 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;

@@ -71,6 +72,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;

@@ -215,6 +217,9 @@
   

   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   @Resource

   private AppVersionService appVersionService;

   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -505,11 +510,35 @@
      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)));

            .toJson(filterForClientUser));

      data.put("first", 0);

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

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

@@ -2059,4 +2088,46 @@
      }

   }



	
   /**

    *  获取等级信息

    * @param acceptData

    * @param uid

    * @param out

    */

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

   public void getUserConfig(AcceptData acceptData, Long uid, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }

		
      try {

			
         String inviteCode = userInfoExtraService.getUserInviteCode(uid);

			
         JSONObject inviteData = new JSONObject();

         if (inviteCode == null || inviteCode.trim().length() == 0) {

            // 无邀请码

            inviteData.put("content", "邀请激活");

            inviteData.put("link", configService.get("invite_activation_url"));

         } else {

            // 已有邀请码

            inviteData.put("content", "邀请码");

            inviteData.put("link", configService.get("invite_activation_success_url"));

         }

			
         JSONObject data = new JSONObject();

         data.put("invite", inviteData);

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

			
      } catch (UserInfoExtraException e) {

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

      } catch (Exception e) {

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

         e.printStackTrace();

      }

   }

}