用户注册信息

yujian

2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -28,9 +28,11 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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

import com.yeshi.fanli.entity.shop.BanLiShopOrder;

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

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

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

import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;

import com.yeshi.fanli.log.LogHelper;

@@ -38,6 +40,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

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

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

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

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

@@ -45,6 +48,7 @@
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.shop.BanLiShopOrderService;

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

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

@@ -121,6 +125,9 @@
   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

@@ -183,6 +190,9 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   /**

    * 新版登录 V1.5.3

    * 

@@ -240,6 +250,7 @@
                  if (active != null) {

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

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

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

                  }

               }

            });

@@ -257,7 +268,7 @@
         } else {

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

            try {

               LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

               LogHelper.error("登录出错:" + e.getCode() + "-" + e.getMessage());

            } catch (Exception e1) {

               e1.printStackTrace();

            }

@@ -378,14 +389,26 @@
      vo.setNickName(userInfo.getNickName());

      vo.setPortrait(userInfo.getPortrait());

      vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));

      vo.setCsdLink(configService.get("customer_service_link"));

      vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));



      // 省钱 -自购产生返利

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);

      // 分享赚

      BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);

      // 邀请赚

      BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);

      Date now = new Date();

      Date start = new Date(0);



      // 返利订单、奖励券提成

      List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();

      typeFanli.add(UserMoneyDetailTypeEnum.fanli);

      typeFanli.add(UserMoneyDetailTypeEnum.orderReward);

      BigDecimal finishMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now)

            .abs();



      // 邀请订单、分享订单、补贴

      List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

      typeList.add(UserMoneyDetailTypeEnum.systemEqualize);

      typeList.add(UserMoneyDetailTypeEnum.subsidy);

      BigDecimal rewardMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();



      UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);

      vo.setVipInfo(userVIPInfo);

@@ -410,16 +433,25 @@
            && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) { // VIP

         vo.setSuccessTime(TimeUtil.getGernalTime(userVIPInfo.getSuccessTime().getTime(), "yyyy.MM.dd"));

         vo.setConserveMoney(finishMoney);

         vo.setEarnMoney(MoneyBigDecimalUtil.add(rewardShare, rewardInvite));

         vo.setEarnMoney(rewardMoney);

      } else {

         BigDecimal rate1 = new BigDecimal(5);

         BigDecimal rate2 = new BigDecimal(12);

         vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney, MoneyBigDecimalUtil.div(rate1, rate2)));

         vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardShare, MoneyBigDecimalUtil.div(rate1, rate2)));

         BigDecimal rate = new BigDecimal("0.409");

         vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney, rate));

         vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardMoney, rate));

      }

      vo.setFinishMoney(finishMoney);

      vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));



      // 会员规则执行时间

		
      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));

      vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));



		
      // 区分老用户和新用户

      String limtDate = userVipConfigService.getValueByKey("vip_execute_time");

      Date executeDate = null;

      try {

@@ -428,14 +460,6 @@
      } catch (ParseException e) {

         e.printStackTrace();

      }

      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      vo.setFinishGoldCoin(integralDetailService.getCumulativeMoney(uid));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney));

      vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));



      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

            && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {

@@ -445,9 +469,9 @@
      }

      vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));

      vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));

      vo.setLimitgoldCoin(new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));

      vo.setLimitgoldCoin(Long.parseLong(userVipConfigService.getValueByKey("require_gold_coin")));



      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

      GsonBuilder gsonBuilder = new GsonBuilder();

      gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

         @Override

         public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

@@ -461,8 +485,7 @@
         }

      });

      Gson gson = gsonBuilder.create();

		
		


      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));

      } else {

@@ -493,7 +516,18 @@


      // 省钱 -自购产生返利



      // 会员规则执行时间

      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

      long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);



      long limitTeam = 0;



      // 区分老用户和新用户

      String limtDate = userVipConfigService.getValueByKey("vip_execute_time");

      Date executeDate = null;

      try {

@@ -502,17 +536,7 @@
      } catch (ParseException e) {

         e.printStackTrace();

      }

      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney);

      long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);



      long limitTeam = 0;



				
      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

            && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {