Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -10,6 +10,7 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

import java.util.UUID;



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

@@ -66,8 +68,11 @@
import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

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;

@@ -90,6 +95,8 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

@@ -111,6 +118,8 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import com.yeshi.fanli.vo.user.UserInfoExtraVO;

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -202,6 +211,15 @@


   @Resource

   private UserShareGoodsRecordService userShareGoodsRecordService;



   @Resource

   private UserCustomSettingsService userCustomSettingsService;



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

@@ -491,19 +509,48 @@
      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());



      int showTiCheng = 1; // 不显示

      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

         data.put("showTiCheng", false);

      else

      else {

         data.put("showTiCheng", spreadImgCount + shareCount > 0);

         if (spreadImgCount + shareCount > 0) {

            showTiCheng = 0;

         }

      }



      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

@@ -511,6 +558,34 @@
               Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

      else

         data.put("inviteList", configService.get("team_list"));



      // 界面状态

      UserSettingsVO mySettings = null;

      try {

         mySettings = userCustomSettingsService.getMySettings(user.getId());

      } catch (UserCustomSettingsException e) {

         mySettings = new UserSettingsVO();

         e.printStackTrace();

      }



      if (mySettings.getCancelNotice() == null) {

         mySettings.setCancelNotice(0);

      }

      if (mySettings.getNoBonusCount() == null) {

         mySettings.setNoBonusCount(showTiCheng); // 根据showTiCheng来判断

      }

      if (mySettings.getNoNewsRedDot() == null) {

         mySettings.setNoNewsRedDot(0);

      }

      if (mySettings.getNoShareRecordAndStorage() == null) {

         mySettings.setNoShareRecordAndStorage(showTiCheng); // 根据showTiCheng来判断

      }

      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }



      data.put("moduleState", mySettings);



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

      final UserInfo uuser = user;

      ThreadUtil.run(new Runnable() {

@@ -520,6 +595,13 @@
            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

            wxDownService.save(device);

            // 更新用户附加信息，老用户不存在的需要添加

            try {

               userInfoExtraService.updateUserRankByUid(uuser.getId());

            } catch (UserInfoExtraException e) {

               e.printStackTrace();

            }



         }

      });

   }

@@ -1840,6 +1922,21 @@
      resultData.put("secondTeam", secondTeam);

      resultData.put("secondTeamTotal", secondTeamTotal);

      resultData.put("boss", bossData);

		
		
      boolean hasCode = false;

      try {

         String inviteCode = userInfoExtraService.getUserInviteCode(uid);

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

            hasCode = true;   // 已有邀请码

         } else {

            // 邀请激活链接

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

         }

      } catch (UserInfoExtraException e) {

         e.printStackTrace();

      }

      resultData.put("hasCode", hasCode);



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

   }

@@ -1934,7 +2031,121 @@
         out.print(JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }



   }



   /**

    * 设置界面开关状态

    * 
    * @param acceptData

    * @param uid

    * @param params

    * @param out

    */

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

   public void setModuleState(AcceptData acceptData, Long uid, String params, PrintWriter out) {



      if (uid == null) {

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

         return;

      }



      try {

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

            out.print(JsonUtil.loadFalseResult("传递参数为空"));

            return;

         }



         JSONObject json = JSONObject.fromObject(params);

         Iterator<String> iterator = json.keys();

         while (iterator.hasNext()) {

            String type = (String) iterator.next();

            int state = json.getInt(type);

            userCustomSettingsService.saveModuleState(uid, type, state);

         }

         out.print(JsonUtil.loadTrueResult("设置成功"));



      } catch (UserCustomSettingsException e) {

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

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("设置失败"));

         e.printStackTrace();

      }

   }



   /**

    * 获取等级信息

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

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

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



      if (uid == null) {

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

         return;

      }



      try {

         UserInfoExtraVO rankInfo = userInfoExtraService.getRankInfo(uid);

         GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

         gsonBuilder.excludeFieldsWithoutExposeAnnotation();

         Gson gson = gsonBuilder.setDateFormat("yyyy.MM.dd").create();



         JSONObject resultData = new JSONObject();

         resultData.put("rankInfo", gson.toJson(rankInfo));



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



      } catch (UserInfoExtraException e) {

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

      } catch (Exception e) {

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

         e.printStackTrace();

      }

   }



   /**

    * 获取等级信息

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

      }

   }

}