admin
2019-09-24 f54093a69938aca18ca6ba005e17afe5ee5bbfe6
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -24,6 +24,7 @@
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;
@@ -36,15 +37,16 @@
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.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
@@ -58,6 +60,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
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;
@@ -125,6 +128,9 @@
   private DeviceTokenHWService deviceTokenHWService;
   @Resource
   private DeviceTokenOPPOService deviceTokenOPPOService;
   @Resource
   private TaoBaoUnionConfigService taoBaoUnionConfigService;
   @Resource
@@ -156,6 +162,9 @@
   @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";
@@ -253,6 +262,11 @@
                     platformType = 2;
                  }
                  userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
                  // 绑定oppo推送
                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
                  if (active != null) {
                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
                  }
               } catch (Exception e) {
                  e.printStackTrace();
               }
@@ -1128,9 +1142,15 @@
   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());
         }
      }
      out.print(JsonUtil.loadTrueResult(""));
   }
@@ -1208,6 +1228,12 @@
                     } catch (Exception e) {
                        e.printStackTrace();
                     }
                  }
                  // 绑定oppo推送
                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
                  if (active != null) {
                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
                  }
               }
            });
@@ -1322,7 +1348,7 @@
      }
      try {
         userAccountService.bindWeiXin(acceptData,uid, code);
         userAccountService.bindWeiXin(acceptData, uid, code);
         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
         // 判断taoBaoUid是否已经封禁