Merge remote-tracking branch 'origin/master'

admin

2019-01-23 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259

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

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -504,11 +509,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());