Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -33,6 +33,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

@@ -40,6 +41,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

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

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

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

@@ -48,6 +50,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;

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

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

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

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

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

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

@@ -57,7 +60,9 @@
import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

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



import net.sf.json.JSONObject;

@@ -137,6 +142,16 @@


   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;

	
   @Resource

   private HomeNavbarUserService homeNavbarUserService;

	
   @Resource

   private UserInfoDeleteRecordService userInfoDeleteRecordService;

	
   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -463,10 +478,7 @@
            // 封禁用户

            // 封禁绑定的正常用户

            if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

               UserInfo update = new UserInfo(uid);

               update.setState(UserInfo.STATE_FORBIDDEN);

               update.setStateDesc("绑定被封禁的电话号码被封禁");

               userInfoService.updateByPrimaryKeySelective(update);

               userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的电话号码");

            }

            return;

         }

@@ -564,10 +576,7 @@
               // 封禁用户

               // 封禁绑定的正常用户

               if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

                  UserInfo update = new UserInfo(uid);

                  update.setState(UserInfo.STATE_FORBIDDEN);

                  update.setStateDesc("绑定被封禁的淘宝号被封禁");

                  userInfoService.updateByPrimaryKeySelective(update);

                  userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的淘宝号");

               }

               return;

            }

@@ -638,10 +647,7 @@
            // 封禁用户

            // 封禁绑定的正常用户

            if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

               UserInfo update = new UserInfo(uid);

               update.setState(UserInfo.STATE_FORBIDDEN);

               update.setStateDesc("绑定被封禁的微信号被封禁");

               userInfoService.updateByPrimaryKeySelective(update);

               userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的微信号");

            }

            return;

         }

@@ -925,10 +931,7 @@
         // 封禁用户

         // 封禁绑定的正常用户

         if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

            UserInfo update = new UserInfo(uid);

            update.setState(UserInfo.STATE_FORBIDDEN);

            update.setStateDesc("绑定被封禁的支付宝被封禁");

            userInfoService.updateByPrimaryKeySelective(update);

            userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的支付宝");

         }

         return;

      }

@@ -1157,8 +1160,16 @@
            final UserInfo uuser = userInfo;

            ThreadUtil.run(new Runnable() {

               public void run() {

                  String device = acceptData.getDevice();

                  try {

                     /* 同步未登录之前设备抽奖数据 */

                     // 同步自定义导航

                     homeNavbarUserService.synchroDeviceToUser(uuser.getId(), device);

                  } catch (Exception e) {

                     LogHelper.errorDetailInfo(e);

                  }

						
                  /* 同步未登录之前设备抽奖数据 */

                  try {

                     int platformType = 0;

                     String platform = acceptData.getPlatform();

                     if ("android".equals(platform)) {

@@ -1166,11 +1177,19 @@
                     } else if ("ios".equals(platform)) {

                        platformType = 2;

                     }

                     userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType,

                           acceptData.getDevice());

                     userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, device);

                  } catch (Exception e) {

                     e.printStackTrace();

                  }

						
                  if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                     /* 新人红包 */

                     try {

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  } 
               }

            });

         }

@@ -1244,10 +1263,7 @@
            // 封禁用户

            // 封禁绑定的正常用户

            if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

               UserInfo update = new UserInfo(uid);

               update.setState(UserInfo.STATE_FORBIDDEN);

               update.setStateDesc("绑定被封禁的电话号码被封禁");

               userInfoService.updateByPrimaryKeySelective(update);

               userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的电话号码");

            }

            return;

         }

@@ -1298,10 +1314,7 @@
            // 封禁用户

            // 封禁绑定的正常用户

            if (user != null && user.getState() != null && user.getState() == UserInfo.STATE_NORMAL) {

               UserInfo update = new UserInfo(uid);

               update.setState(UserInfo.STATE_FORBIDDEN);

               update.setStateDesc("绑定被封禁的微信号被封禁");

               userInfoService.updateByPrimaryKeySelective(update);

               userAccountService.forbiddenUser(uid, "封禁：绑定被封禁的微信号");

            }

            return;

         }