淘礼金相关

yujian

2019-06-25 b7b8f2a4fe9059ef7b5470a68bb1b34787bc92b2

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

@@ -1,11 +1,6 @@
package com.yeshi.fanli.controller.client.v1;



import java.awt.image.BufferedImage;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStream;

import java.io.PrintWriter;

import java.io.UnsupportedEncodingException;

import java.lang.reflect.InvocationTargetException;

@@ -21,7 +16,6 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.imageio.ImageIO;

import javax.servlet.http.HttpServletRequest;



import org.apache.commons.beanutils.PropertyUtils;

@@ -90,6 +84,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

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

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

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

@@ -106,7 +101,6 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -126,8 +120,6 @@
import com.yeshi.fanli.vo.user.UserInfoExtraVO;

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



import net.coobird.thumbnailator.Thumbnails;

import net.coobird.thumbnailator.Thumbnails.Builder;

import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@@ -218,6 +210,9 @@
   

   @Resource

   private MaskKeyService maskKeyService;

	
   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -587,7 +582,9 @@
      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }



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

         mySettings.setOpenSpreadHongBao(0);

      }

      data.put("moduleState", mySettings);



      int welfareCenterNews = 0;

@@ -624,7 +621,7 @@
            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

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

            // 用户等级更新

            try {

               userInfoExtraService.updateUserRankByUid(uuser.getId());

            } catch (UserInfoExtraException e) {

@@ -1346,6 +1343,18 @@
      // count>0 有消息

      int count = accountMessageService.getCanOpenCount(uid);

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

		
      ThreadUtil.run(new Runnable() {

         @Override

         public void run() {

            // 用户等级更新

            try {

               userInfoExtraService.updateUserRankByUid(uid);

            } catch (Exception e) {

               LogHelper.errorDetailInfo(e);

            }

         }

      });

   }



   @RequestMapping("collectionGoods")

@@ -2085,7 +2094,18 @@
         if (mySettings.getNoInvitationBonus() == null) {

            mySettings.setNoInvitationBonus(0);

         }

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

            if(userTaoLiJinDetailService.countDetail(uid) > 0) {

               mySettings.setOpenSpreadHongBao(1);

            } else {

               mySettings.setOpenSpreadHongBao(0);

            }

         }

         data.put("moduleState", mySettings);

			
			
			


         int welfareCenterNews = 0;

         String invitCode = null;