fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -178,7 +178,9 @@ FloatAD floatAD = listAD.get(i); FloatADTypeEnum typeEnum = floatAD.getTypeEnum(); if (typeEnum == FloatADTypeEnum.newUserRedPack && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) { && (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) { listAD.remove(i); i--; continue; fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -440,7 +440,17 @@ } 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 { @@ -449,14 +459,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(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString())); 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())) { @@ -513,7 +515,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 { @@ -522,17 +535,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())) { fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -99,7 +99,7 @@ @Transactional(rollbackFor = Exception.class) public void inviteSucceedReward(Long teamUid) throws Exception { // 是否在上线之后的邀请关系 ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME)); ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME)); if (threeSale == null) return; @@ -190,7 +190,7 @@ return; // 验证上下级关系 ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME)); ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME)); if (threeSale == null || threeSale.getBoss().getId().longValue() != uid.longValue()) return;
@@ -297,6 +297,12 @@ if (extra == null) return false; // 1、直接粉丝（从 2020 年 1 月 1 日起直接粉丝产生有效订单） BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay")); long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney); // 区分老用户和新用户 String limtDate = userVipConfigService.getValueByKey("vip_execute_time"); Date executeDate = null; try { @@ -308,9 +314,6 @@ if (executeDate == null) return false; // 1、直接粉丝（从 2020 年 1 月 1 日起直接粉丝产生有效订单） BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay")); long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney); if (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime()) { long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")); if (teamNum < limitNum) fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -124,10 +124,12 @@ // 微信自动提现最低余额 public static final int AUTO_EXTRACT_MIN_SURPLUS = 2; // vip、红包、奖励券倒计时 2.1上线时间 public static final String VIP_ONLINE_TIME = "2019-12-01"; public static final String VIP_ONLINE_TIME = "2019-12-20"; // 红包邀请奖励 public static final String RED_PACK_ONLINE_TIME = "2019-12-14"; // 一阶段：20天数限制 public static final int ONE_STAGE_LIMIT_DAYS = 20; // 一阶段：立得现金3元
