增加小米推送注册regId服务，暂时取消推送时的消息免打扰过滤

admin

2019-12-12 f005fc9eb911b3dc543e9069053323cc8f70201d

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

@@ -14,6 +14,7 @@
import org.yeshi.utils.encrypt.DESUtil;



import com.alipay.api.AlipayApiException;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

@@ -23,28 +24,33 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

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

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

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

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;

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

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

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;

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

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

@@ -54,15 +60,14 @@
import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

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.wx.WXLoginUtil;



@@ -124,6 +129,15 @@
   private DeviceTokenHWService deviceTokenHWService;



   @Resource

   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

@@ -152,9 +166,12 @@


   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;

	


   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;



   @Resource

   private DeviceActiveService deviceActiveService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -221,8 +238,8 @@
      tbUserInfo.setTbPic(tbPortrait);



      try {

         LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,

               wxinstall, loginType);

         LoginResult result = userAccountService.login(request, acceptData, first, system.getAppid(), code, phone,

               tbUserInfo, wxinstall, loginType);

         if (result == null)

            LogHelper.error("login-result为空值");



@@ -252,6 +269,13 @@
                     platformType = 2;

                  }

                  userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());

                  // 绑定oppo,vivo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -387,7 +411,10 @@
      }

      UserInfo user = null;

      if (!StringUtil.isNullOrEmpty(code)) {

         WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

         WXAccountInfoDTO accountInfo = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());



         WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, accountInfo.getAppId(),

               accountInfo.getAppSecret());

         if (weiXinUser == null) {

            out.print(JsonUtil.loadFalseResult(1, "获取微信用户信息失败"));

            return;

@@ -640,7 +667,7 @@
      }



      try {

         userAccountService.changeWXBind(uid, code);

         userAccountService.changeWXBind(acceptData, uid, code);

         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁

         ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

@@ -941,6 +968,8 @@
      String[] ALIPAY_CODES = new String[] { "SYSTEM_ERROR", "PERMIT_CHECK_PERM_LIMITED", "PERM_AML_NOT_REALNAME_REV",

            "PERM_AML_NOT_REALNAME_REV", "PAYEE_USER_INFO_ERROR", "PAYEE_ACC_OCUPIED",

            "PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };

      BindingAccount oldBindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid,

            BindingAccount.TYPE_ALIPAY);

      try {

         BigDecimal balance = user.getMyHongBao();

         BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);

@@ -951,7 +980,7 @@
         else

            out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                  "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。注：此0.1元将会在后续产生的余额中合理扣除，敬请知晓。"));

			


         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);

      } catch (AlipayTransferException e1) {

         if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {

@@ -974,7 +1003,11 @@
      } catch (AlipayAccountException e3) {

         // 账户无余额

         if (e3.getCode() == AlipayAccountException.CODE_NO_MONEY) {

            out.print(JsonUtil.loadFalseResult(5, "你的账户目前没有余额，无需绑定提现账号。"));

            if (oldBindingAccount != null) {

               out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，无需修改，请有余额后修改"));

            } else {

               out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，请有余额后绑定"));

            }

            return;

            // 提现次数限制

         } else if (e3.getCode() == AlipayAccountException.CODE_TIMES_LIMIT) {

@@ -1118,9 +1151,19 @@
   public void logOut(AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null || uid == 0)

         return;

      // 需要解绑HW推送的用户绑定

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

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

         // 需要解绑HW推送的用户绑定

         deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());

         if (deviceActive != null) {

            // 解绑OPPO推送的用户绑定

            deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());

            // 解绑VIVO推送的用户绑定

            deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());

            // 解绑XM推送的用户绑定

            deviceTokenXMService.unBindUid(deviceActive.getId());

         }

      }

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

   }



@@ -1156,7 +1199,7 @@


         // 微信登录

         if (loginType == 2) {

            userInfo = userAccountService.loginWinXin(request, loginType, code, system.getAppid());

            userInfo = userAccountService.loginWinXin(request, acceptData, loginType, code, system.getAppid());

         }



         if (userInfo == null) {

@@ -1191,13 +1234,12 @@
                     e.printStackTrace();

                  }



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

                     /* 新人红包 */

                     try {

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

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  // 绑定oppo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

               }

            });

@@ -1312,7 +1354,7 @@
      }



      try {

         userAccountService.bindWeiXin(uid, code);

         userAccountService.bindWeiXin(acceptData, uid, code);



         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁