hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BZIZI 整体替换为ATYOU

Browse Source
This commit is contained in:
tianfeng 2026-03-26 10:38:27 +08:00
parent be7f7d7c05
commit d8c424bf9f
65 changed files with 111 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rc-common-business/common-business-core/src/main/java/com/red/circle/common/business/core/enums/SysOriginPlatformEnum.java
View File

@ -30,13 +30,13 @@ public enum SysOriginPlatformEnum implements ISysOriginPlatform {
LOTFUN("Lotfun",9),
HOOKA("Hooka",10),
LIKEI("Likei",11),
BZIZI("Bzizi",12),
ATYOU("Atyou",12),
;
/**
* 语言房系统.
*/
private static final List<SysOriginPlatformEnum> VOICE_SYSTEM = List.of(TARAB, YOLO, HALAR, LIKEI, HOOKA, BZIZI);
private static final List<SysOriginPlatformEnum> VOICE_SYSTEM = List.of(TARAB, YOLO, HALAR, LIKEI, HOOKA, ATYOU);
/**
* 平台名称.

2
rc-common-business/common-business-core/src/main/java/com/red/circle/common/business/core/level/LevelUtils.java
View File

@ -33,7 +33,7 @@ public class LevelUtils {
LevelType.ROOM, new LevelCalculation(10000L * 5L),
LevelType.CARD, new LevelCalculation(1000L * 5L)
),
SysOriginPlatformEnum.BZIZI, Map.of(
SysOriginPlatformEnum.ATYOU, Map.of(
LevelType.USER, new LevelCalculation(500L * 5L),
LevelType.ROOM, new LevelCalculation(10000L * 5L),
LevelType.CARD, new LevelCalculation(1000L * 5L)

2
rc-service-game/game-fruit/src/main/java/com/red/circle/game/fruit/application/dto/enums/GameSysOriginEnum.java
View File

@ -15,7 +15,7 @@ public enum GameSysOriginEnum implements ISysOriginPlatform {
LOTFUN("Lotfun"),
HOOKA("Hooka"),
LIKEI("Likei"),
BZIZI("Bzizi"),
ATYOU("Atyou"),
;
private final String originName;

7
rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/sys/SysActivityConfigServiceImpl.java
View File

@ -26,7 +26,6 @@ import com.red.circle.other.inner.endpoint.activity.PropsActivityClient;
import com.red.circle.other.inner.endpoint.material.gift.GiftConfigClient;
import com.red.circle.other.inner.endpoint.sys.SysActivityConfigClient;
import com.red.circle.other.inner.endpoint.user.user.WeekKingQueenClient;
import com.red.circle.other.inner.endpoint.user.user.api.WeekKingQueenClientApi;
import com.red.circle.other.inner.enums.activity.KingQueenType;
import com.red.circle.other.inner.model.cmd.activity.SendActivityRewardCmd;
import com.red.circle.other.inner.model.dto.material.GiftConfigDTO;
@ -50,8 +49,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import static com.red.circle.common.business.core.enums.SysOriginPlatformEnum.BZIZI;
/**
* 系统活动配置.
*
@ -271,8 +268,8 @@ public class SysActivityConfigServiceImpl implements SysActivityConfigService {
@Override
public ActivityRankCO getActivityRank(Long activityId) {
ResultResponse<PageResult<SysActivityCountDTO>> response = weekKingQueenClient.listRanking("BZIZI", KingQueenType.CHARM, getThisWeekDate(), 1L, 20L);
ResultResponse<PageResult<SysActivityCountDTO>> response2 = weekKingQueenClient.listRanking("BZIZI", KingQueenType.WEALTH, getThisWeekDate(), 1L, 20L);
ResultResponse<PageResult<SysActivityCountDTO>> response = weekKingQueenClient.listRanking(SysOriginPlatformEnum.ATYOU.name(), KingQueenType.CHARM, getThisWeekDate(), 1L, 20L);
ResultResponse<PageResult<SysActivityCountDTO>> response2 = weekKingQueenClient.listRanking(SysOriginPlatformEnum.ATYOU.name(), KingQueenType.WEALTH, getThisWeekDate(), 1L, 20L);
List<SysActivityCountDTO> butOnes = (ArrayList) response.getBody().getRecords();
List<SysActivityCountDTO> butTwos = (ArrayList) response2.getBody().getRecords();

6
rc-service/rc-service-console/console-infrastructure/src/main/java/com/red/circle/console/infra/database/rds/service/count/impl/StatisticsDailyRegisterLogoutPlatformServiceImpl.java
View File

@ -2,10 +2,7 @@ package com.red.circle.console.infra.database.rds.service.count.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.console.infra.database.rds.dao.app.IUserBaseInfoDAO;
import com.red.circle.console.infra.database.rds.dao.count.StatisticsDailyRegisterLogoutPlatformDAO;
import com.red.circle.console.infra.database.rds.entity.app.IUserBaseInfo;
import com.red.circle.console.infra.database.rds.entity.count.StatisticsDailyRegisterLogoutPlatform;
@ -20,7 +17,6 @@ import java.util.stream.Collectors;
import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@ -59,7 +55,7 @@ public class StatisticsDailyRegisterLogoutPlatformServiceImpl extends
private String countUserByRegion(LocalDate countTime, LocalDate endCountTime) {
// 查询各个区域的注册信息插入数据库
List<IUserBaseInfo> userBaseInfos = userBaseInfoService.countUserByRegion(SysOriginPlatformEnum.BZIZI.getSysOrigin(), countTime, endCountTime);
List<IUserBaseInfo> userBaseInfos = userBaseInfoService.countUserByRegion(SysOriginPlatformEnum.ATYOU.getSysOrigin(), countTime, endCountTime);
log.warn("新增用户开始结束时间:" + countTime + "----" + endCountTime + "----" + JSON.toJSONString(userBaseInfos));
List<IUserBaseInfo> TH = userBaseInfos.stream().filter(item -> item.getCountryCode().equals("TH") || item.getCountryCode().equals("LA")).toList();
List<IUserBaseInfo> MY = userBaseInfos.stream().filter(item -> item.getCountryCode().equals("MY")).toList();

2
rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/UserProfileAndCountryQueryExe.java
View File

@ -67,7 +67,7 @@ public class UserProfileAndCountryQueryExe {
userRegionClient.getRegionId(userProfile.getId())
);
if (Objects.equals(cmd.getSysOrigin(), SysOriginPlatformEnum.BZIZI.name())) {
if (Objects.equals(cmd.getSysOrigin(), SysOriginPlatformEnum.ATYOU.name())) {
ResponseAssert.isTrue(CommonErrorCode.NOT_SUPPORTED_REGION, StringUtils.isNotBlank(regionId));
List<RegionRelationDTO> regionRelationList = getRegionRelationList(userProfile, regionId);

4
rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/scheduler/GoogleReimburseCheckTask.java
View File

@ -5,7 +5,6 @@ import com.google.api.services.androidpublisher.model.VoidedPurchasesListRespons
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.pay.google.GoogleVerifyService;
import com.red.circle.component.redis.annotation.TaskCacheLock;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.web.props.EnvProperties;
import com.red.circle.order.app.common.RecycleReimburseOrderProductCommon;
import com.red.circle.order.domain.tuple.KeyValuePair;
@ -21,7 +20,6 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@ -58,7 +56,7 @@ public class GoogleReimburseCheckTask {
public void executeReimburse(int latestMinutes) {
List.of(
KeyValuePair.of(SysOriginPlatformEnum.BZIZI, "com.tkm.likei")
KeyValuePair.of(SysOriginPlatformEnum.ATYOU, "com.tkm.likei")
).forEach(keyValuePair -> {
VoidedPurchasesListResponse response = googleVerifyService

2
rc-service/rc-service-order/order-inner-endpoint/src/main/java/com/red/circle/order/inner/service/impl/OrderPurchaseHistoryClientServiceImpl.java
View File

@ -106,7 +106,7 @@ public class OrderPurchaseHistoryClientServiceImpl implements OrderPurchaseHisto
.select(OrderPurchaseHistory::getId)
.eq(OrderPurchaseHistory::getUserId, userId)
.eq(OrderPurchaseHistory::getPayPlatform, "GOOGLE")
.eq(OrderPurchaseHistory::getSysOrigin, "BZIZI")
.eq(OrderPurchaseHistory::getSysOrigin, SysOriginPlatformEnum.ATYOU.name())
.list();
return CollectionUtils.isNotEmpty(list);
}

5
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/game/party3rd/GameHkysRestController.java
View File

@ -18,7 +18,6 @@ import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.core.security.UserCredential;
import com.red.circle.framework.web.annotation.IgnoreResultResponse;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.cmd.activity.RankingDataUpdateCmd;
import com.red.circle.other.app.dto.cmd.game.GameLxwlUpdateBalanceCmd;
@ -171,7 +170,7 @@ public class GameHkysRestController {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.GAME_BAISHUN_WIN)
.data(build)
.build()
@ -246,7 +245,7 @@ public class GameHkysRestController {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(request.getCoin());
receiverCmd.setBizNo(request.getGameId());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
//游戏王日榜

7
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/LotteryDrawExe.java
View File

@ -16,7 +16,6 @@ import com.red.circle.other.infra.database.rds.entity.activity.LotteryTicket;
import com.red.circle.other.infra.database.rds.entity.activity.LotteryTicketRecord;
import com.red.circle.other.infra.database.rds.entity.activity.LotteryUserCount;
import com.red.circle.other.infra.database.rds.entity.activity.LotteryUserProgress;
import com.red.circle.other.infra.database.rds.entity.user.user.LatestMobileDevice;
import com.red.circle.other.infra.database.rds.service.activity.LotteryActivityService;
import com.red.circle.other.infra.database.rds.service.activity.LotteryPrizeService;
import com.red.circle.other.infra.database.rds.service.activity.LotteryRecordService;
@ -27,19 +26,15 @@ import com.red.circle.other.infra.database.rds.service.activity.LotteryUserProgr
import com.red.circle.other.infra.database.rds.service.activity.LotteryDeviceRecordService;
import com.red.circle.other.infra.database.rds.service.activity.UserActivityRechargeService;
import com.red.circle.other.infra.database.rds.entity.activity.LotteryDeviceRecord;
import com.red.circle.other.infra.database.rds.service.user.device.LatestMobileDeviceService;
import com.red.circle.other.infra.gateway.lottery.LotteryBackpackGateway;
import com.red.circle.other.infra.utils.ZonedDateTimeUtils;
import com.red.circle.other.inner.asserts.OtherErrorCode;
import com.red.circle.other.inner.asserts.lottery.LotteryErrorCode;
import com.red.circle.tool.core.date.TimestampUtils;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.temporal.WeekFields;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
@ -155,7 +150,7 @@ public class LotteryDrawExe {
.userId(userId)
.amount(PennyAmount.ofDollar(activity.getCoinCost().longValue()))
.eventId(activity.getId())
.sysOrigin(SysOriginPlatformEnum.BZIZI)
.sysOrigin(SysOriginPlatformEnum.ATYOU)
.origin(GoldOrigin.CP_LOTTERY)
.build();
ResponseAssert.requiredSuccess(walletGoldClient.changeBalance(build));

6
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/LotteryMultiDrawExe.java
View File

@ -26,19 +26,15 @@ import com.red.circle.other.infra.database.rds.service.activity.LotteryUserCount
import com.red.circle.other.infra.database.rds.service.activity.LotteryUserProgressService;
import com.red.circle.other.infra.database.rds.service.activity.LotteryDeviceRecordService;
import com.red.circle.other.infra.database.rds.service.activity.UserActivityRechargeService;
import com.red.circle.other.infra.database.rds.service.user.device.LatestMobileDeviceService;
import com.red.circle.other.infra.gateway.lottery.LotteryBackpackGateway;
import com.red.circle.other.infra.utils.ZonedDateTimeUtils;
import com.red.circle.other.inner.asserts.OtherErrorCode;
import com.red.circle.other.inner.asserts.lottery.LotteryErrorCode;
import com.red.circle.tool.core.date.TimestampUtils;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.temporal.WeekFields;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
@ -541,7 +537,7 @@ public class LotteryMultiDrawExe {
.userId(userId)
.amount(PennyAmount.ofDollar(amount.longValue()))
.eventId(activityId)
.sysOrigin(SysOriginPlatformEnum.BZIZI)
.sysOrigin(SysOriginPlatformEnum.ATYOU)
.origin(GoldOrigin.CP_LOTTERY)
.build();
ResponseAssert.requiredSuccess(walletGoldClient.changeBalance(build));

8
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
View File

@ -2,7 +2,6 @@ package com.red.circle.other.app.command.bd.query;
import com.alibaba.fastjson.JSON;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.RedisKeys;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.order.inner.endpoint.InAppPurchaseDetailsClient;
@ -23,13 +22,11 @@ import com.red.circle.other.infra.database.mongo.service.bd.BdSalaryPolicyServic
import com.red.circle.other.infra.database.mongo.service.team.team.*;
import com.red.circle.other.infra.enums.BdPolicyType;
import com.red.circle.other.infra.enums.BdSettlementStatus;
import com.red.circle.other.infra.database.mongo.dto.team.TeamBillSettleResult;
import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
import com.red.circle.other.infra.database.rds.entity.team.BusinessDevelopmentBaseInfo;
import com.red.circle.other.infra.database.rds.entity.team.BusinessDevelopmentTeam;
import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentBaseInfoService;
import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentTeamService;
import com.red.circle.other.inner.endpoint.team.bd.BdTeamLeaderClient;
import com.red.circle.other.inner.enums.team.TeamBillCycleStatus;
import com.red.circle.other.inner.model.dto.agency.agency.TeamCounter;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
@ -41,10 +38,7 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -346,7 +340,7 @@ public class TeamBdMemberBillListQryExe {
ResultResponse<List<BatchUserRechargeStatisticsDTO>> response =
inAppPurchaseDetailsClient.batchUserRechargeStatistics(
memberIds,
SysOriginPlatformEnum.BZIZI.name(),
SysOriginPlatformEnum.ATYOU.name(),
startTime,
endTime
);

9
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponUseCmdExe.java
View File

@ -1,10 +1,8 @@
package com.red.circle.other.app.command.propcoupon;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.PlatformChannelEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.other.app.dto.cmd.PropCouponUseCmd;
import com.red.circle.other.domain.gateway.PropCouponGateway;
import com.red.circle.other.domain.propcoupon.PropCoupon;
@ -12,22 +10,17 @@ import com.red.circle.other.domain.propcoupon.PropCouponStatus;
import com.red.circle.other.domain.propcoupon.PropCouponType;
import com.red.circle.other.infra.database.rds.dao.props.PropCouponUseRecordDAO;
import com.red.circle.other.infra.database.rds.entity.props.PropCouponUseRecordDO;
import com.red.circle.other.infra.database.rds.entity.props.PropsCommodityStore;
import com.red.circle.other.infra.database.rds.service.props.PropsCommodityStoreService;
import com.red.circle.other.inner.asserts.OtherErrorCode;
import com.red.circle.other.inner.asserts.user.UserErrorCode;
import com.red.circle.other.inner.endpoint.live.RoomManagerClient;
import com.red.circle.other.inner.endpoint.material.props.*;
import com.red.circle.other.inner.endpoint.user.user.UserProfileClient;
import com.red.circle.other.inner.enums.material.BadgeBackpackExpireTypeEnum;
import com.red.circle.other.inner.enums.material.ConsolePropsTypeEnum;
import com.red.circle.other.inner.enums.material.SysNobleVipTypeEnum;
import com.red.circle.other.inner.enums.sys.SysBadgeConfigTypeEnum;
import com.red.circle.other.inner.model.cmd.material.GiveBadgeCmd;
import com.red.circle.other.inner.model.cmd.material.GivePropsBackpackCmd;
import com.red.circle.other.inner.model.dto.material.PropsCommodityStoreDTO;
import com.red.circle.other.inner.model.dto.material.props.PropsNobleVipAbilityDTO;
import com.red.circle.tool.core.parse.DataTypeUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -125,7 +118,7 @@ public class PropCouponUseCmdExe {
case NOBLE_VIP:
// 赠送VIP（贵族VIP）
PropsNobleVipAbilityDTO vipAbility = getVipAbilityBySysOriginSourceId(propId, SysOriginPlatformEnum.BZIZI.name());
PropsNobleVipAbilityDTO vipAbility = getVipAbilityBySysOriginSourceId(propId, SysOriginPlatformEnum.ATYOU.name());
giveProps(userId, propId, ConsolePropsTypeEnum.NOBLE_VIP.getName(), validDays);
if (Objects.nonNull(vipAbility.getCarId()) && !Objects

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/redpacket/SendRoomRedPacketCmdExe.java
View File

@ -224,7 +224,7 @@ public class SendRoomRedPacketCmdExe {
if (cmd.getTotalAmount() >= 10000) {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.ROOM_RED_PACKET)
.data(build)
.build()

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/redpacket/SendUserRedPacketCmdExe.java
View File

@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.HashMap;
@ -96,7 +95,7 @@ public class SendUserRedPacketCmdExe {
}
ConsumptionLevel consumptionLevel = consumptionLevelService.getByUserId(cmd.getReqUserId());
Integer level = LevelUtils.getWealthLevel(SysOriginPlatformEnum.BZIZI, consumptionLevel.getConsumptionGolds().longValue()).getLevel();
Integer level = LevelUtils.getWealthLevel(SysOriginPlatformEnum.ATYOU, consumptionLevel.getConsumptionGolds().longValue()).getLevel();
ResponseAssert.isTrue(OtherErrorCode.USER_WEALTH_NEED_THAN_10, level >= 10);
boolean eqRegion = userRegionGateway.checkEqRegion(cmd.getReqUserId(), cmd.getReceiverUserId());

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketLaunchCmdExe.java
View File

@ -29,8 +29,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -186,7 +184,7 @@ public class RocketLaunchCmdExe {
// build.put("toLevel", toLevel);
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.ROCKET_ENERGY_LAUNCH)
.data(build)
.build()

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketRewardClaimCmdExe.java
View File

@ -9,7 +9,6 @@ import com.red.circle.external.inner.model.cmd.message.CustomGroupMsgBodyCmd;
import com.red.circle.external.inner.model.enums.message.GroupMessageTypeEnum;
import com.red.circle.other.app.dto.clientobject.RocketRewardCO;
import com.red.circle.other.app.dto.cmd.RocketRewardClaimCmd;
import com.red.circle.other.app.manager.RocketImPushManager;
import com.red.circle.other.app.util.DistributedLockUtil;
import com.red.circle.other.domain.gateway.RocketConfigGateway;
import com.red.circle.other.domain.gateway.RocketHistoryGateway;
@ -38,7 +37,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -256,7 +254,7 @@ public class RocketRewardClaimCmdExe {
.opsIncome()
.userId(userId)
.eventId(bizNo)
.sysOrigin(SysOriginPlatformEnum.BZIZI)
.sysOrigin(SysOriginPlatformEnum.ATYOU)
.origin(GoldOrigin.ROCKET_REWARD)
.originDescribe(GoldOrigin.ROCKET_REWARD.name())
.amount(amount)

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/RoomThemeSwitchUseCmdExe.java
View File

@ -104,7 +104,7 @@ public class RoomThemeSwitchUseCmdExe {
}
private PropsCommodityStore getThemeStoreBySourceId(SwitchUseThemeCmd cmd) {
return propsCommodityStoreService.getBySourceId(SysOriginPlatformEnum.BZIZI, cmd.getThemeId(),
return propsCommodityStoreService.getBySourceId(SysOriginPlatformEnum.ATYOU, cmd.getThemeId(),
PropsCommodityType.THEME.name());
}

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/signin/SignCheckInExe.java
View File

@ -3,7 +3,6 @@ package com.red.circle.other.app.command.signin;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.other.app.dto.clientobject.signin.CheckInResultCO;
@ -32,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -152,7 +150,7 @@ public class SignCheckInExe {
.setTrackId(config.getGroupId())
.setAcceptUserId(userId)
.setOrigin(SendPropsOrigin.SIGN_IN_REWARD)
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setPrizes(Collections.singletonList(new PrizeDescribe()
.setTrackId(config.getGroupId())
.setType(config.getType())

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/signin/SignInStatusQueryExe.java
View File

@ -47,7 +47,7 @@ public class SignInStatusQueryExe {
);
Set<Long> groupIdSet = configs.stream().map(SignInDailyConfig::getResourceGroupId).collect(Collectors.toSet());
Map<Long, ActivityPropsGroup> propsGroupMap = activitySourceGroupGateway.mapActivityPropsGroup(SysOriginPlatformEnum.BZIZI.name(), groupIdSet);
Map<Long, ActivityPropsGroup> propsGroupMap = activitySourceGroupGateway.mapActivityPropsGroup(SysOriginPlatformEnum.ATYOU.name(), groupIdSet);
Map<Integer, UserSignInRecord> recordMap = records.stream()
.collect(Collectors.toMap(UserSignInRecord::getDayIndex, r -> r));

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/signin/SupplementCheckInExe.java
View File

@ -155,7 +155,7 @@ public class SupplementCheckInExe {
.setTrackId(config.getGroupId())
.setAcceptUserId(userId)
.setOrigin(SendPropsOrigin.SIGN_IN_REWARD)
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setPrizes(Collections.singletonList(new PrizeDescribe()
.setTrackId(config.getGroupId())
.setType(config.getType())

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/ManagerApprovalNotPassCmdExe.java
View File

@ -163,7 +163,7 @@ public class ManagerApprovalNotPassCmdExe {
private void approvalUserAccount(ManagerApprovalCmd cmd) {
if (cmd.checkApprovalUserAccountFreeze()) {
UserConsumptionLevel userLevel = userProfileGateway.getUserConsumptionLevel(
SysOriginPlatformEnum.valueOf("BZIZI"),
SysOriginPlatformEnum.ATYOU,
cmd.getBeApprovalUserId());
checkUserLevel(cmd, userLevel);

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserBeautifulNumberApplyCmdExe.java
View File

@ -30,7 +30,7 @@ public class UserBeautifulNumberApplyCmdExe {
String account = cmd.getAccount();
Long userId = cmd.getReqUserId();
UserConsumptionLevel consumptionLevel = userProfileGateway.getUserConsumptionLevel(SysOriginPlatformEnum.BZIZI, userId);
UserConsumptionLevel consumptionLevel = userProfileGateway.getUserConsumptionLevel(SysOriginPlatformEnum.ATYOU, userId);
Integer wealthLevel = consumptionLevel.getWealthLevel();
// (1) 财富等级>=10级校验

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/game/GameBurstCrystalCommon.java
View File

@ -158,7 +158,7 @@ public class GameBurstCrystalCommon {
try {
// 发送奖励
if (Objects.equals(cmd.getSysOrigin().name(), SysOriginPlatformEnum.BZIZI.name()) || Objects.equals(cmd.getSysOrigin().name(), SysOriginPlatformEnum.TARAB.name())) {
if (Objects.equals(cmd.getSysOrigin().name(), SysOriginPlatformEnum.ATYOU.name()) || Objects.equals(cmd.getSysOrigin().name(), SysOriginPlatformEnum.TARAB.name())) {
sendRewardTwoFun(cmd, processing, ruleConfig, ruleContent.getLevel());
} else {
sendReward(cmd, processing, ruleConfig);

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/gift/GameLuckyGiftCommon.java
View File

@ -455,7 +455,7 @@ public class GameLuckyGiftCommon {
receiverCmd.setDimension(RankingDimension.CONSUME_AMOUNT.getCode());
receiverCmd.setIncrementQuantity(actualAmount);
receiverCmd.setBizNo(IdWorkerUtils.getIdStr());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
}

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/GameKingRewardListener.java
View File

@ -1,6 +1,7 @@
package com.red.circle.other.app.listener;
import com.google.common.collect.Sets;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.component.mq.MessageEventProcess;
import com.red.circle.component.mq.MessageEventProcessDescribe;
@ -89,7 +90,7 @@ public class GameKingRewardListener implements MessageListener {
// 获取活动配置
AppExtCommand cmd = new AppExtCommand();
cmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
cmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
ActivityConfigVO activityConfig = weekKingQueenService.getEffectiveActivity(cmd, templateId);
if (activityConfig == null || activityConfig.getConfig() == null) {
log.warn("活动配置不存在, templateId: {}", templateId);

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java
View File

@ -18,7 +18,6 @@ import com.red.circle.other.app.dto.cmd.SpinsTaskProgressUpdateCmd;
import com.red.circle.other.app.dto.cmd.task.RoomDailyTaskProgressUpdateCmd;
import com.red.circle.other.app.service.SpinsUserTaskProgressService;
import com.red.circle.other.app.service.task.RoomDailyTaskProgressService;
import com.red.circle.other.app.service.user.user.UserProfileService;
import com.red.circle.other.app.util.DateTimeAsiaRiyadhUtils;
import com.red.circle.other.domain.enums.VipBenefitType;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
@ -704,7 +703,7 @@ public class GiftCountStrategy implements GiftStrategy {
private Long getActualAmount(GiftValue giftValue, BigDecimal acceptAmount) {
if (isLuckyGift(giftValue)) {
BigDecimal ratio = gameLuckyGiftCommon.getLuckyGiftShareRatio(SysOriginPlatformEnum.BZIZI.name());
BigDecimal ratio = gameLuckyGiftCommon.getLuckyGiftShareRatio(SysOriginPlatformEnum.ATYOU.name());
return acceptAmount.multiply(ratio).setScale(0, RoundingMode.DOWN).longValue();
}

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java
View File

@ -2,6 +2,7 @@ package com.red.circle.other.app.listener.gift.strategy;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.mq.business.model.event.gift.OfflineProcessGiftEvent;
import com.red.circle.other.app.common.gift.GameLuckyGiftCommon;
@ -480,7 +481,7 @@ public class RankCountStrategy implements GiftStrategy {
receiverCmd.setDimension(RankingDimension.CONSUME_AMOUNT.getCode());
receiverCmd.setIncrementQuantity(actualAmount);
receiverCmd.setBizNo(runningWater.getId().toString());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
}

10
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/task/TaskListener.java
View File

@ -2,9 +2,7 @@ package com.red.circle.other.app.listener.task;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.base.Throwables;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.component.mq.MessageEventProcess;
import com.red.circle.component.mq.MessageEventProcessDescribe;
import com.red.circle.component.mq.config.RocketMqMessageListener;
@ -35,10 +33,8 @@ import com.red.circle.other.infra.database.rds.service.user.user.InviteUserSumma
import com.red.circle.other.infra.database.rds.service.user.user.RelationshipFriendService;
import com.red.circle.other.infra.gateway.RankingActivityGateway;
import com.red.circle.other.inner.endpoint.activity.PropsActivityClient;
import com.red.circle.other.inner.model.cmd.activity.SendActivityRewardCmd;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.wallet.inner.endpoint.wallet.WalletGoldClient;
import com.red.circle.wallet.inner.model.cmd.GoldReceiptCmd;
import com.red.circle.wallet.inner.model.enums.GoldOrigin;
@ -372,7 +368,7 @@ public class TaskListener implements MessageListener {
// 发送道具
/*propsActivityCnfClient.sendActivityReward(new SendActivityRewardCmd()
.setTrackId(IdWorkerUtils.getId())
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setAcceptUserId(eventBody.getUserId())
.setSourceGroupId(userTaskProgress.getRewardId())
.setOrigin(SendPropsOrigin.DAILY_TASK_REWARD)
@ -423,7 +419,7 @@ public class TaskListener implements MessageListener {
.build());
inviteUserSummaryService.incrCommission(userInviteUser.getUserId(), BigDecimal.valueOf(gold));
inviteUserRechargeCommissionService.add(SysOriginPlatformEnum.BZIZI.name(), userInviteUser.getUserId(),
inviteUserRechargeCommissionService.add(SysOriginPlatformEnum.ATYOU.name(), userInviteUser.getUserId(),
userInviteUser.getInviteUserId(), BigDecimal.valueOf(gold));
recordRanking(userInviteUser.getUserId(), gold);
@ -438,7 +434,7 @@ public class TaskListener implements MessageListener {
private void recordRanking(Long userId, Long quantity) {
RankingActivityRecord record = new RankingActivityRecord();
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setUserId(userId);
record.setUserSex(1);
record.setActivityType(RankingActivityType.INVITE);

6
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/RocketImPushManager.java
View File

@ -3,14 +3,10 @@ package com.red.circle.other.app.manager;
import com.alibaba.fastjson.JSON;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.external.inner.endpoint.message.ImGroupClient;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.BroadcastGroupMsgBodyCmd;
import com.red.circle.external.inner.model.cmd.message.CustomGroupMsgBodyCmd;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
import com.red.circle.external.inner.model.enums.message.GroupMessageTypeEnum;
import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
import com.red.circle.other.app.dto.clientobject.RocketStatusCO;
import com.red.circle.other.app.util.OfficialNoticeUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -54,7 +50,7 @@ public class RocketImPushManager {
try {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
// .type(GroupMessageTypeEnum.ROCKET_ENERGY_LAUNCH)
.data(status)
.build()

16
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java
View File

@ -7,13 +7,11 @@ import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.other.app.convertor.material.GiftAppConvertor;
import com.red.circle.other.app.convertor.sys.ActivityAppConvertor;
import com.red.circle.other.app.dto.clientobject.activity.ActivityResourceCO;
import com.red.circle.other.app.dto.clientobject.gift.GiftConfigCO;
import com.red.circle.other.domain.gateway.props.ActivitySourceGroupGateway;
import com.red.circle.other.domain.gateway.user.ability.UserRegionGateway;
import com.red.circle.other.domain.ranking.RankingActivityType;
import com.red.circle.other.domain.ranking.RankingCycleType;
import com.red.circle.other.infra.common.activity.PropsActivitySendCommon;
@ -33,7 +31,6 @@ import com.red.circle.other.infra.database.mongo.service.user.count.WeekFriendsh
import com.red.circle.other.infra.database.mongo.service.user.region.SysRegionConfigService;
import com.red.circle.other.infra.database.rds.entity.activity.ActivityFriendshipCardHistory;
import com.red.circle.other.infra.database.rds.entity.activity.PropsActivityRuleConfig;
import com.red.circle.other.infra.database.rds.enums.OtherConfigEnum;
import com.red.circle.other.infra.database.rds.service.activity.ActivityFriendshipCardChampionService;
import com.red.circle.other.infra.database.rds.service.activity.ActivityFriendshipCardHistoryService;
import com.red.circle.other.infra.database.rds.service.activity.PropsActivityRuleConfigService;
@ -68,7 +65,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
@ -116,7 +112,7 @@ public class WeeklyRewardsSentManager {
log.warn("[execute] 每周奖励统一发送 start:{}", LocalDateTimeUtils.nowFormat("yyyy-MM-dd"));
List<SysOriginPlatformEnum> list = List.of(SysOriginPlatformEnum.BZIZI);
List<SysOriginPlatformEnum> list = List.of(SysOriginPlatformEnum.ATYOU);
list.forEach(sysOriginPlatformEnum -> {
@ -211,7 +207,7 @@ public class WeeklyRewardsSentManager {
Long activityId = activityConfigDTO.getId();
String lastWeekDate = getLastWeekDate();
String sysOrigin = SysOriginPlatformEnum.BZIZI.name();
String sysOrigin = SysOriginPlatformEnum.ATYOU.name();
// 获取枚举
RankingCycleType cycleType = RankingCycleType.WEEKLY;
// 4. 获取奖励配置并更新
@ -227,15 +223,15 @@ public class WeeklyRewardsSentManager {
// 发放活动奖励
if (isKingGames(activityConfigDTO)) {
sendCustomRankingActivityRewards(SysOriginPlatformEnum.BZIZI, activityId, records, kingRewardList);
sendCustomRankingActivityRewards(SysOriginPlatformEnum.ATYOU, activityId, records, kingRewardList);
}
if (isRamadan(activityConfigDTO)) {
sendRamadanRankingActivityRewards(SysOriginPlatformEnum.BZIZI, activityId, records, kingRewardList);
sendRamadanRankingActivityRewards(SysOriginPlatformEnum.ATYOU, activityId, records, kingRewardList);
}
else {
sendRankingActivityRewards(SysOriginPlatformEnum.BZIZI, activityId, records, kingRewardList);
sendRankingActivityRewards(SysOriginPlatformEnum.ATYOU, activityId, records, kingRewardList);
}
log.info("上周{}活动奖励发放完成, 活动ID: {}", activityConfigDTO.getRemark(), activityId);
@ -436,7 +432,7 @@ public class WeeklyRewardsSentManager {
private ActivityConfigDTO getActivityConfig(Long templateId, String activityType) {
try {
ActivityConfigBackQryCmd query = new ActivityConfigBackQryCmd();
query.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
query.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
query.setTemplateId(templateId);
return ResponseAssert.requiredSuccess(sysActivityConfigClient.effectiveActivityByTemplate(templateId, activityType));
} catch (Exception e) {

11
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DailyTask.java
View File

@ -1,6 +1,7 @@
package com.red.circle.other.app.scheduler;
import com.alibaba.fastjson.JSON;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.annotation.TaskCacheLock;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.dto.ResultResponse;
@ -35,7 +36,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import static com.red.circle.common.business.core.enums.SysOriginPlatformEnum.BZIZI;
import static com.red.circle.common.business.core.enums.SysOriginPlatformEnum.ATYOU;
/**
* 每日任务数据.
@ -70,7 +71,7 @@ public class DailyTask {
String yesterdayCycleKey = ZonedDateTimeUtils.getAsiaRiyadhYesterday().toString();
RankingListQueryCmd cmd = new RankingListQueryCmd();
cmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
cmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
cmd.setCycleKey(yesterdayCycleKey);
List<RankingUserVO> top3 = kingGamesDailyTopThreeQryExe.execute(cmd);
@ -98,7 +99,7 @@ public class DailyTask {
.userId(user.getUserId())
.amount(PennyAmount.ofDollar(reward))
.eventId(eventId)
.sysOrigin(BZIZI)
.sysOrigin(ATYOU)
.origin(GoldOrigin.GAME_KING_AWARD)
.build());
log.info("[GameKingDaily] 发放成功 userId={} rank={} reward={}", user.getUserId(), user.getRank(), reward);
@ -125,7 +126,7 @@ public class DailyTask {
ImmutableKeyValuePair<String, String> valuePair = ImmutableKeyValuePair.of("PURCHASE_NOBLE_VIP_GIVEAWAY", "Give Noble");
try {
List<PropsStoreCommodity> propsStoreCommodities = propsStoreGateway.listReleaseStoreCommodity(BZIZI, PropsCommodityType.NOBLE_VIP);
List<PropsStoreCommodity> propsStoreCommodities = propsStoreGateway.listReleaseStoreCommodity(ATYOU, PropsCommodityType.NOBLE_VIP);
// 按照VIP等级从大到小排序
List<PropsStoreCommodity> commodityList = propsStoreCommodities.stream()
@ -159,7 +160,7 @@ public class DailyTask {
.appIncome()
.userId(userId)
.eventId(propsStoreCommodity.getId())
.sysOrigin(BZIZI)
.sysOrigin(ATYOU)
.origin(valuePair.getKey())
.originDescribe(valuePair.getValue())
.amount(propsStoreCommodity.getNobleVipAbility().getLoginRewardsAmount())

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DiamondToCoinsTask.java
View File

@ -16,7 +16,6 @@ import com.red.circle.wallet.inner.endpoint.wallet.WalletDiamondClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.Map;
@ -43,7 +42,7 @@ public class DiamondToCoinsTask {
@TaskCacheLock(key = "USER_SALARY_DIAMOND_BALANCE", expireSecond = 86400)
public void diamondToCoins() {
Map<Long, BigDecimal> userIdBalanceMap = salaryDiamondBalanceClient.mapBalanceBySysOrigin(SysOriginPlatformEnum.BZIZI.name()).getBody();
Map<Long, BigDecimal> userIdBalanceMap = salaryDiamondBalanceClient.mapBalanceBySysOrigin(SysOriginPlatformEnum.ATYOU.name()).getBody();
if (CollectionUtils.isEmpty(userIdBalanceMap)) {
log.warn("【钻石转金币定时器】:LIKEI 系统不存在钻石余额数据");
return;

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/EmptyRoomCleanTask.java
View File

@ -37,7 +37,7 @@ public class EmptyRoomCleanTask {
public void cleanEmptyRooms() {
try {
// 获取所有活跃房间
List<ActiveVoiceRoom> allRooms = activeVoiceRoomService.listDiscover(SysOriginPlatformEnum.BZIZI.name(),true,"",null,200);
List<ActiveVoiceRoom> allRooms = activeVoiceRoomService.listDiscover(SysOriginPlatformEnum.ATYOU.name(),true,"",null,200);
if (CollectionUtils.isEmpty(allRooms)) {
return;
}

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/RoomRedPacketExpireTask.java
View File

@ -132,7 +132,7 @@ public class RoomRedPacketExpireTask {
.userId(userId)
.amount(PennyAmount.ofDollar(remainAmount))
.eventId(packetId + "_refund")
.sysOrigin(SysOriginPlatformEnum.BZIZI)
.sysOrigin(SysOriginPlatformEnum.ATYOU)
.origin(GoldOrigin.ROOM_RED_PACKET)
.build();

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/UpdateStartPageUserTask.java
View File

@ -53,7 +53,7 @@ public class UpdateStartPageUserTask {
log.warn("========== 更新启动页用户定时任务开始 ==========");
try {
String sysOrigin = SysOriginPlatformEnum.BZIZI.name();
String sysOrigin = SysOriginPlatformEnum.ATYOU.name();
String lastWeekDate = getLastWeekDate();
Long topUserId = getLastWeekTopUser(sysOrigin, lastWeekDate);
@ -85,7 +85,7 @@ public class UpdateStartPageUserTask {
long startTime = System.currentTimeMillis();
try {
String sysOrigin = SysOriginPlatformEnum.BZIZI.name();
String sysOrigin = SysOriginPlatformEnum.ATYOU.name();
List<WeekCpValueCount> topList = weekCpValueCountService.listLastWeekTop(sysOrigin, 1);

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/UserRedPacketExpireTask.java
View File

@ -1,5 +1,6 @@
package com.red.circle.other.app.scheduler;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.annotation.TaskCacheLock;
import com.red.circle.other.domain.gateway.UserRedPacketGateway;
import com.red.circle.other.domain.redpacket.UserRedPacket;
@ -107,7 +108,7 @@ public class UserRedPacketExpireTask {
.userId(userId)
.amount(PennyAmount.ofDollar(amount))
.eventId(packetId + "_refund")
.sysOrigin("BZIZI")
.sysOrigin(SysOriginPlatformEnum.ATYOU.name())
.origin(GoldOrigin.USER_RED_PACKET)
.build();

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/activity/GameKingRewardTask.java
View File

@ -53,7 +53,7 @@ public class GameKingRewardTask {
cmd.setCycleKey(ZonedDateTimeAsiaRiyadhUtils.nowWeekMondayToInt().toString());
cmd.setActivityType(RankingActivityType.KING_GAMES.getCode());
cmd.setTemplateId("2001207026499137537");
cmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
cmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
RankingListQueryCmd top4Cmd = new RankingListQueryCmd();
top4Cmd.setActivityType(cmd.getActivityType());

2
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/activity/RamadanRankingBadgeTask.java
View File

@ -48,7 +48,7 @@ public class RamadanRankingBadgeTask {
try {
// 获取前十名
List<RankingActivityRecord> top10 = rankingActivityGateway.getRankingList(
SysOriginPlatformEnum.BZIZI.name(),
SysOriginPlatformEnum.ATYOU.name(),
RankingActivityType.RAMADAN,
RankingCycleType.WEEKLY,
ZonedDateTimeAsiaRiyadhUtils.nowWeekMondayToInt().toString(),

5
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/activity/SpringFestivalRechargeRewardTask.java
View File

@ -3,7 +3,6 @@ package com.red.circle.other.app.scheduler.activity;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.component.redis.annotation.TaskCacheLock;
import com.red.circle.other.infra.database.rds.dao.activity.UserActivityRechargeDAO;
import com.red.circle.other.infra.database.rds.dto.activity.ActivityRechargeRankDTO;
import com.red.circle.other.inner.model.cmd.activity.SendActivityRewardCmd;
@ -11,8 +10,6 @@ import com.red.circle.other.inner.endpoint.activity.PropsActivityClient;
import com.red.circle.tool.core.collection.CollectionUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@ -63,7 +60,7 @@ public class SpringFestivalRechargeRewardTask {
propsActivityClient.sendActivityReward(new SendActivityRewardCmd()
.setTrackId(ACTIVITY_ID)
.setOrigin(SendPropsOrigin.RANKING_ACTIVITY)
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setSourceGroupId(rewardGroupId)
.setAcceptUserId(userId)
);

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/cp/CpRankingBadgeTask.java
View File

@ -4,13 +4,11 @@ import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.annotation.TaskCacheLock;
import com.red.circle.mq.business.model.event.BadgeOperateEvent;
import com.red.circle.mq.rocket.business.producer.UserMqMessageService;
import com.red.circle.other.infra.database.mongo.entity.ranking.RankingRewardSnapshot;
import com.red.circle.other.infra.database.mongo.entity.user.count.WeekCpValueCount;
import com.red.circle.other.infra.database.mongo.service.user.count.WeekCpValueCountService;
import com.red.circle.other.infra.database.rds.entity.badge.BadgeBackpack;
import com.red.circle.other.infra.database.rds.service.badge.BadgeBackpackService;
import com.red.circle.other.inner.enums.material.BadgeBackpackExpireType;
import com.red.circle.other.inner.enums.material.BadgeKeyEnum;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import lombok.RequiredArgsConstructor;
@ -49,7 +47,7 @@ public class CpRankingBadgeTask {
public void sendWeekRankingReward() {
try {
// 1. 获取本周前三名CP对
List<WeekCpValueCount> thisWeekTop3 = weekCpValueCountService.listThisWeekTop(SysOriginPlatformEnum.BZIZI.name(), 3);
List<WeekCpValueCount> thisWeekTop3 = weekCpValueCountService.listThisWeekTop(SysOriginPlatformEnum.ATYOU.name(), 3);
if (CollectionUtils.isEmpty(thisWeekTop3)) {
log.warn("CP排名徽章任务：本周前三名数据为空");
return;

4
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/cp/CpRankingRewardTask.java
View File

@ -36,7 +36,7 @@ public class CpRankingRewardTask {
log.warn("========== CP周榜奖励发放定时任务开始 ==========");
try {
List<SysOriginPlatformEnum> platforms = List.of(SysOriginPlatformEnum.BZIZI);
List<SysOriginPlatformEnum> platforms = List.of(SysOriginPlatformEnum.ATYOU);
int successCount = 0;
int errorCount = 0;
@ -83,7 +83,7 @@ public class CpRankingRewardTask {
log.warn("========== 检测到赛季切换，开始发放上赛季奖励 ==========");
log.warn("[CP赛季榜] 赛季切换: {} -> {}", lastSeasonCycleKey, currentSeasonCycleKey);
List<SysOriginPlatformEnum> platforms = List.of(SysOriginPlatformEnum.BZIZI);
List<SysOriginPlatformEnum> platforms = List.of(SysOriginPlatformEnum.ATYOU);
int successCount = 0;
int errorCount = 0;

7
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java
View File

@ -2,11 +2,7 @@ package com.red.circle.other.app.service;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.other.app.command.bd.query.BdTeamSummaryQryExe;
import com.red.circle.other.app.dto.clientobject.AdminSalarySettlementCO;
import com.red.circle.other.app.dto.clientobject.BdTeamSummaryCO;
import com.red.circle.other.app.dto.h5.RechargeSummaryVO;
import com.red.circle.other.app.service.recharge.RechargeUserService;
import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalaryPolicy;
@ -25,7 +21,6 @@ import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.wallet.inner.endpoint.salary.UserSalaryAccountClient;
import com.red.circle.wallet.inner.model.cmd.SalaryIssueInnerCmd;
import com.red.circle.wallet.inner.model.cmd.SalaryRunningWaterQueryInnerCmd;
import com.red.circle.wallet.inner.model.dto.SalaryRunningWaterDTO;
import com.red.circle.wallet.inner.model.enums.SalaryEvent;
import com.red.circle.wallet.inner.model.enums.SalaryType;
@ -106,7 +101,7 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
AdminSalarySettlementRecord record = new AdminSalarySettlementRecord();
record.setId(IdWorkerUtils.getIdStr());
record.setTimeId(IdWorkerUtils.getId());
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setAdminUserId(adminUserId);
record.setBillBelong(billBelong);
record.setBillTitle(billTitle);

5
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdLeaderSalarySettlementServiceImpl.java
View File

@ -16,10 +16,8 @@ import com.red.circle.other.infra.database.mongo.service.bd.BdLeaderSalarySettle
import com.red.circle.other.infra.database.mongo.service.bd.BdSalarySettlementRecordService;
import com.red.circle.other.infra.database.rds.entity.team.BusinessDevelopmentBaseInfo;
import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentBaseInfoService;
import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentTeamService;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.wallet.inner.endpoint.bank.UserBankBalanceClient;
import com.red.circle.wallet.inner.endpoint.salary.UserSalaryAccountClient;
import com.red.circle.wallet.inner.model.cmd.SalaryIssueInnerCmd;
import com.red.circle.wallet.inner.model.dto.SalaryRunningWaterDTO;
@ -27,7 +25,6 @@ import com.red.circle.wallet.inner.model.enums.SalaryType;
import com.red.circle.wallet.inner.model.enums.SalaryEvent;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -121,7 +118,7 @@ public class BdLeaderSalarySettlementServiceImpl implements BdLeaderSalarySettle
BdLeaderSalarySettlementRecord record = new BdLeaderSalarySettlementRecord();
record.setId(IdWorkerUtils.getIdStr());
record.setTimeId(IdWorkerUtils.getId());
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setBdLeaderUserId(bdLeaderUserId);
record.setBillBelong(billBelong);
record.setBillTitle(billTitle);

16
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdSalarySettlementServiceImpl.java
View File

@ -1,9 +1,6 @@
package com.red.circle.other.app.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.red.circle.common.business.core.enums.ReceiptType;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.other.app.dto.clientobject.BdSalarySettlementCO;
import com.red.circle.other.app.dto.clientobject.BdTeamStatisticsCO;
@ -26,21 +23,14 @@ import com.red.circle.other.infra.database.rds.entity.team.BusinessDevelopmentTe
import com.red.circle.other.infra.database.rds.service.team.BusinessDevelopmentTeamService;
import com.red.circle.other.inner.enums.team.TeamSalaryStatisticsCO;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.order.inner.endpoint.api.InAppPurchaseDetailsClientApi;
import com.red.circle.order.inner.model.dto.inapp.BatchUserRechargeStatisticsDTO;
import com.red.circle.wallet.inner.endpoint.bank.UserBankBalanceClient;
import com.red.circle.wallet.inner.endpoint.bank.UserBankRunningWaterClient;
import com.red.circle.wallet.inner.endpoint.salary.UserSalaryAccountClient;
import com.red.circle.wallet.inner.model.cmd.SalaryIssueInnerCmd;
import com.red.circle.wallet.inner.model.cmd.SalaryRunningWaterQueryInnerCmd;
import com.red.circle.wallet.inner.model.cmd.UserBankBalanceIncrCmd;
import com.red.circle.wallet.inner.model.dto.SalaryRunningWaterDTO;
import com.red.circle.wallet.inner.model.dto.UserBankRunningWaterDTO;
import com.red.circle.wallet.inner.model.enums.SalaryEvent;
import com.red.circle.wallet.inner.model.enums.SalaryType;
import com.red.circle.wallet.inner.model.enums.UserBankWaterEvent;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -243,7 +233,7 @@ public class BdSalarySettlementServiceImpl implements BdSalarySettlementService
ResultResponse<List<BatchUserRechargeStatisticsDTO>> response =
inAppPurchaseDetailsClientApi.batchUserRechargeStatistics(
new ArrayList<>(allUserIds),
SysOriginPlatformEnum.BZIZI.name(),
SysOriginPlatformEnum.ATYOU.name(),
startTime,
endTime
);
@ -352,7 +342,7 @@ public class BdSalarySettlementServiceImpl implements BdSalarySettlementService
ResultResponse<List<BatchUserRechargeStatisticsDTO>> response =
inAppPurchaseDetailsClientApi.batchUserRechargeStatistics(
userIds,
SysOriginPlatformEnum.BZIZI.name(),
SysOriginPlatformEnum.ATYOU.name(),
startTime,
endTime
);
@ -387,7 +377,7 @@ public class BdSalarySettlementServiceImpl implements BdSalarySettlementService
BdSalarySettlementRecord record = new BdSalarySettlementRecord();
record.setId(IdWorkerUtils.getIdStr());
record.setTimeId(IdWorkerUtils.getId());
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setBdUserId(bdUserId);
record.setBillBelong(billBelong);
record.setBillTitle(billTitle);

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameActivityService.java
View File

@ -1,5 +1,6 @@
package com.red.circle.other.app.service.game;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.other.app.dto.cmd.SpinsTaskProgressUpdateCmd;
@ -81,7 +82,7 @@ public class GameActivityService {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(rewardAmount);
receiverCmd.setBizNo(gameId);
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
}

5
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/GameBaishunServiceImpl.java
View File

@ -23,7 +23,6 @@ import com.red.circle.framework.core.exception.ResponseException;
import com.red.circle.framework.core.security.UserCredential;
import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.cmd.activity.RankingDataUpdateCmd;
import com.red.circle.other.app.dto.cmd.task.RoomDailyTaskProgressUpdateCmd;
@ -285,7 +284,7 @@ public class GameBaishunServiceImpl implements GameBaishunService {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.GAME_BAISHUN_WIN)
.data(build)
.build()
@ -322,7 +321,7 @@ public class GameBaishunServiceImpl implements GameBaishunService {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(request.getCurrencyDiff());
receiverCmd.setBizNo(request.getGameRoundId());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
//游戏王日榜

7
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/HotGameServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.core.exception.ResponseException;
import com.red.circle.framework.core.security.UserCredential;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.cmd.activity.RankingDataUpdateCmd;
import com.red.circle.other.app.dto.cmd.task.RoomDailyTaskProgressUpdateCmd;
@ -391,7 +390,7 @@ public class HotGameServiceImpl implements HotGameService {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(request.getCoin());
receiverCmd.setBizNo(request.getGameId());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
}
}
@ -431,7 +430,7 @@ public class HotGameServiceImpl implements HotGameService {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(param.getCoin());
receiverCmd.setBizNo(param.getGameId());
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
//游戏王日榜
@ -460,7 +459,7 @@ public class HotGameServiceImpl implements HotGameService {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.GAME_BAISHUN_WIN)
.data(build)
.build()

7
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/game/YomiGameServiceImpl.java
View File

@ -9,7 +9,6 @@ import com.red.circle.external.inner.model.enums.message.GroupMessageTypeEnum;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.core.security.UserCredential;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.cmd.activity.RankingDataUpdateCmd;
import com.red.circle.other.app.dto.cmd.party3rd.*;
@ -286,7 +285,7 @@ public class YomiGameServiceImpl implements YomiGameService {
return;
}
BigDecimal cost = enumConfigCacheService.getValueBigDecimal(EnumConfigKey.GAME_BROADCAST_AMOUNT, SysOriginPlatformEnum.BZIZI.name()) ;
BigDecimal cost = enumConfigCacheService.getValueBigDecimal(EnumConfigKey.GAME_BROADCAST_AMOUNT, SysOriginPlatformEnum.ATYOU.name()) ;
int thresholdAmount = Optional.ofNullable(cost).orElse(new BigDecimal("5000")).intValue();
if (rewardAmount < thresholdAmount) {
return;
@ -300,7 +299,7 @@ public class YomiGameServiceImpl implements YomiGameService {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.GAME_BAISHUN_WIN)
.data(build)
.build()
@ -333,7 +332,7 @@ public class YomiGameServiceImpl implements YomiGameService {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(rewardAmount.longValue());
receiverCmd.setBizNo(gameId);
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
//游戏王日榜

7
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/props/PropsSendCommon.java
View File

@ -1,7 +1,6 @@
package com.red.circle.other.infra.common.props;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Sets;
import com.red.circle.common.business.core.enums.ReceiptType;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.DiamondOrigin;
@ -27,7 +26,6 @@ import com.red.circle.other.infra.convertor.material.PropsMaterialInfraConvertor
import com.red.circle.other.infra.database.cache.service.other.EmojiCacheService;
import com.red.circle.other.infra.database.mongo.entity.live.RoomSetting;
import com.red.circle.other.infra.database.mongo.service.live.RoomProfileManagerService;
import com.red.circle.other.infra.database.rds.entity.badge.BadgeBackpack;
import com.red.circle.other.infra.database.rds.entity.badge.BadgePictureConfig;
import com.red.circle.other.infra.database.rds.entity.props.PropsSendLog;
import com.red.circle.other.infra.database.rds.entity.props.PropsSourceRecord;
@ -42,18 +40,15 @@ import com.red.circle.other.infra.database.rds.service.props.PropsSourceRecordSe
import com.red.circle.other.infra.database.rds.service.props.PropsVipActualEquityService;
import com.red.circle.other.infra.database.rds.service.user.user.ConsumptionLevelService;
import com.red.circle.other.infra.utils.I18nUtils;
import com.red.circle.other.inner.asserts.OtherErrorCode;
import com.red.circle.other.inner.enums.material.BadgeConfigTypeEnum;
import com.red.circle.other.inner.enums.material.NobleVipEnum;
import com.red.circle.other.inner.enums.material.PropsCommodityType;
import com.red.circle.other.inner.model.cmd.material.PrizeDescribe;
import com.red.circle.other.inner.model.cmd.material.PrizeDescribeRewardCmd;
import com.red.circle.other.inner.model.cmd.material.PropCouponGrantCmd;
import com.red.circle.other.inner.model.dto.material.PropsResourcesDTO;
import com.red.circle.other.inner.model.dto.material.props.NobleVipAbility;
import com.red.circle.other.inner.model.dto.material.props.ProductProps;
import com.red.circle.other.inner.model.dto.material.props.PropsResources;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.num.NumConstant;
@ -267,7 +262,7 @@ public class PropsSendCommon {
Map<String, Object> map = new HashMap<>();
map.put("propType", conf.getDetailType());
if (BadgeConfigTypeEnum.of(conf.getDetailType())) {
BadgePictureConfig badgePictureConfig = badgePictureConfigService.getByBadgeId(SysOriginPlatformEnum.BZIZI.name(), propsId);
BadgePictureConfig badgePictureConfig = badgePictureConfigService.getByBadgeId(SysOriginPlatformEnum.ATYOU.name(), propsId);
url = badgePictureConfig != null ? badgePictureConfig.getSelectUrl() : "";
}
officialNoticeClient.send(

4
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/InviteUserGatewayImpl.java
View File

@ -4,9 +4,7 @@ import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.RechargeCommissionResult;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.domain.ranking.RankingActivityType;
import com.red.circle.other.domain.ranking.RankingCycleType;
import com.red.circle.other.domain.ranking.RankingDimension;
@ -135,7 +133,7 @@ public class InviteUserGatewayImpl implements InviteUserGateway {
private void recordRanking(Long userId, Long quantity) {
RankingActivityRecord record = new RankingActivityRecord();
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setUserId(userId);
record.setUserSex(1);
record.setActivityType(RankingActivityType.INVITE);

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserProfileGatewayImpl.java
View File

@ -527,7 +527,7 @@ public class UserProfileGatewayImpl implements UserProfileGateway {
}
private boolean inWhiteList(Long userId) {
EnumConfigDTO configDTO = enumConfigCacheService.getByCode("LOGIN_WHITE_CONFIG", "BZIZI");
EnumConfigDTO configDTO = enumConfigCacheService.getByCode("LOGIN_WHITE_CONFIG", SysOriginPlatformEnum.ATYOU.name());
String whiteConfig = Optional.ofNullable(configDTO).map(EnumConfigDTO::getVal).orElse(null);
UserProfile userProfile = getByUserId(userId);
if (whiteConfig == null || userProfile == null) {

12
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/NoticeMessageClientServiceImpl.java
View File

@ -6,16 +6,8 @@ import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.external.inner.endpoint.message.ImGroupClient;
import com.red.circle.external.inner.endpoint.message.NewsletterClient;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.endpoint.push.GoogleFirebasePushClient;
import com.red.circle.external.inner.model.cmd.message.BroadcastGroupMsgBodyCmd;
import com.red.circle.external.inner.model.cmd.message.NewsletterResultCmd;
import com.red.circle.external.inner.model.cmd.message.google.GooglePushCmd;
import com.red.circle.external.inner.model.cmd.message.google.PushMsgBodyCmd;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
import com.red.circle.external.inner.model.enums.PushNoticeType;
import com.red.circle.external.inner.model.enums.message.GroupMessageTypeEnum;
import com.red.circle.external.inner.model.enums.message.NewsletterEvent;
import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.framework.core.response.ResponseErrorCode;
@ -23,7 +15,6 @@ import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.mybatis.constant.PageConstant;
import com.red.circle.other.app.inner.convertor.sys.SysNoticeInnerConvertor;
import com.red.circle.other.app.inner.service.sys.NoticeMessageClientService;
import com.red.circle.other.app.service.user.user.UserProfileService;
import com.red.circle.other.infra.database.mongo.entity.message.PublicMessage;
import com.red.circle.other.infra.database.mongo.service.message.PublicMessageService;
import com.red.circle.other.infra.database.rds.entity.sys.NoticeMessage;
@ -39,7 +30,6 @@ import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.ZonedDateTime;
import java.util.List;
/**
* <p>
@ -155,7 +145,7 @@ public class NoticeMessageClientServiceImpl implements NoticeMessageClientServic
// 发送IM群组广播
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type("notification".equals(noticeMessage.getType()) ? GroupMessageTypeEnum.SYS_ANNOUNCEMENT : GroupMessageTypeEnum.SYS_ACTIVITY)
.data(publicMessage)
.build());

2
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/BdTeamInfoClientServiceImpl.java
View File

@ -147,7 +147,7 @@ public class BdTeamInfoClientServiceImpl implements BdTeamInfoClientService {
}
// 校验新BD Leader是否存在
UserProfile userProfile = userProfileGateway.getByAccount(SysOriginPlatformEnum.BZIZI.name(), String.valueOf(cmd.getNewAccount()));
UserProfile userProfile = userProfileGateway.getByAccount(SysOriginPlatformEnum.ATYOU.name(), String.valueOf(cmd.getNewAccount()));
if (userProfile == null) {
throw new RuntimeException("用户不存在");
}

11
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/user/user/impl/InviteUserClientServiceImpl.java
View File

@ -3,18 +3,15 @@ package com.red.circle.other.app.inner.service.user.user.impl;
import com.google.common.base.Throwables;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.mybatis.convertor.MybatisConvertor;
import com.red.circle.other.app.inner.convertor.user.UserInviteInnerConvertor;
import com.red.circle.other.app.inner.service.user.user.InviteUserClientService;
import com.red.circle.other.app.service.user.user.UserProfileService;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.gateway.user.ability.InviteUserGateway;
import com.red.circle.other.domain.model.user.RechargeCommissionResult;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.domain.ranking.RankingActivityType;
import com.red.circle.other.domain.ranking.RankingCycleType;
import com.red.circle.other.domain.ranking.RankingDimension;
@ -54,11 +51,9 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
/**
* 邀请用户.
@ -179,7 +174,7 @@ public class InviteUserClientServiceImpl implements InviteUserClientService {
.build());
inviteUserSummaryService.incrCommission(result.getInviterUserId(), BigDecimal.valueOf(gold));
inviteUserRechargeCommissionService.add(SysOriginPlatformEnum.BZIZI.name(), result.getInviterUserId(),
inviteUserRechargeCommissionService.add(SysOriginPlatformEnum.ATYOU.name(), result.getInviterUserId(),
result.getInviteeUserId(), BigDecimal.valueOf(gold));
recordRanking(result.getInviterUserId(), gold);
@ -187,7 +182,7 @@ public class InviteUserClientServiceImpl implements InviteUserClientService {
// 道具奖励发给被邀请人B
propsActivityClient.sendActivityReward(new SendActivityRewardCmd()
.setTrackId(IdWorkerUtils.getId())
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setAcceptUserId(result.getInviteeUserId())
.setSourceGroupId(propsId)
.setOrigin(SendPropsOrigin.RECHARGE_7DAY)
@ -198,7 +193,7 @@ public class InviteUserClientServiceImpl implements InviteUserClientService {
private void recordRanking(Long userId, Long quantity) {
RankingActivityRecord record = new RankingActivityRecord();
record.setSysOrigin(SysOriginPlatformEnum.BZIZI.name());
record.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
record.setUserId(userId);
record.setUserSex(1);
record.setActivityType(RankingActivityType.INVITE);

7
rc-service/rc-service-other/other-start/src/test/java/AnchorTargetTest.java
View File

@ -1,4 +1,5 @@
import com.red.circle.OtherServiceApplication;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.infra.common.team.decay.ListMemberWorkDecay;
@ -45,7 +46,7 @@ public class AnchorTargetTest {
TeamMemberWorkQryCmd cmd = new TeamMemberWorkQryCmd();
cmd.setMemberUserId(userId);
cmd.setSysOrigin("BZIZI");
cmd.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
List<TeamMemberWorkDTO> execute = listMemberWorkDecay.execute(cmd);
// 1. 筛选 billStatus = UNPAID 的数据
@ -129,7 +130,7 @@ public class AnchorTargetTest {
// 将account转换为userId并构建batchDeductMap
Map<Long, Long> batchDeductMap = new HashMap<>();
map.forEach((account, amount) -> {
UserProfile userProfile = userProfileGateway.getByAccount("BZIZI", String.valueOf(account));
UserProfile userProfile = userProfileGateway.getByAccount(SysOriginPlatformEnum.ATYOU.name(), String.valueOf(account));
if (Objects.nonNull(userProfile)) {
batchDeductMap.put(userProfile.getId(), amount);
} else {
@ -209,7 +210,7 @@ public class AnchorTargetTest {
private boolean deductSingleAnchorTarget(Long userId, Long deductValue) {
TeamMemberWorkQryCmd cmd = new TeamMemberWorkQryCmd();
cmd.setMemberUserId(userId);
cmd.setSysOrigin("BZIZI");
cmd.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
List<TeamMemberWorkDTO> execute = listMemberWorkDecay.execute(cmd);
// 1. 筛选 billStatus = UNPAID 的数据

5
rc-service/rc-service-other/other-start/src/test/java/BdSettlementTest.java
View File

@ -1,4 +1,5 @@
import com.red.circle.OtherServiceApplication;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.other.app.scheduler.AdminSalarySettlementTask;
import com.red.circle.other.app.scheduler.BdLeaderSalarySettlementTask;
import com.red.circle.other.app.scheduler.BdSalarySettlementTask;
@ -75,7 +76,7 @@ public class BdSettlementTest {
// Long bdUserId = 1963790037740466178L;
// BdSalarySettlementRecord bdSalarySettlementRecord = new BdSalarySettlementRecord();
// bdSalarySettlementRecord.setBillBelong(20251116);
// bdSalarySettlementRecord.setSysOrigin("BZIZI");
// bdSalarySettlementRecord.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
// bdSalarySettlementRecord.setSettlementSalary(new BigDecimal(111));
// bdSalarySettlementRecord.setId(IdWorkerUtils.getIdStr());
// issueSalary(bdUserId, bdSalarySettlementRecord);
@ -84,7 +85,7 @@ public class BdSettlementTest {
Long bdLeaderUserId = 1963790037740466178L;
BdLeaderSalarySettlementRecord bdLeaderSalarySettlementRecord = new BdLeaderSalarySettlementRecord();
bdLeaderSalarySettlementRecord.setBillBelong(20251116);
bdLeaderSalarySettlementRecord.setSysOrigin("BZIZI");
bdLeaderSalarySettlementRecord.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
bdLeaderSalarySettlementRecord.setSettlementSalary(new BigDecimal(2));
bdLeaderSalarySettlementRecord.setId(IdWorkerUtils.getIdStr());
issueSalary(bdLeaderUserId, bdLeaderSalarySettlementRecord);

4
rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java
View File

@ -4,8 +4,6 @@ import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.mq.business.model.event.BadgeOperateEvent;
import com.red.circle.mq.rocket.business.producer.UserMqMessageService;
import com.red.circle.other.app.scheduler.RankingActivityRewardTask;
import com.red.circle.other.app.scheduler.RocketStatusSyncTask;
import com.red.circle.other.app.scheduler.activity.RamadanRankingBadgeTask;
import com.red.circle.other.app.scheduler.activity.SpringFestivalRechargeRewardTask;
import com.red.circle.other.app.scheduler.cp.CleanExpiredDismissingCpTask;
import com.red.circle.other.infra.database.rds.entity.badge.BadgeBackpack;
@ -118,7 +116,7 @@ public class DailTaskTest {
propsActivityClient.sendActivityReward(new SendActivityRewardCmd()
.setTrackId(activityId)
.setOrigin(SendPropsOrigin.RANKING_ACTIVITY)
.setSysOrigin(SysOriginPlatformEnum.BZIZI)
.setSysOrigin(SysOriginPlatformEnum.ATYOU)
.setSourceGroupId(1995472724921741314L)
.setAcceptUserId(userId)
);

19
rc-service/rc-service-other/other-start/src/test/java/SpringTest.java
View File

@ -5,11 +5,8 @@ import com.red.circle.common.business.enums.SendPropsOrigin;
import com.red.circle.external.inner.endpoint.message.ImGroupClient;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.BroadcastGroupMsgBodyCmd;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
import com.red.circle.external.inner.model.enums.message.GroupMessageTypeEnum;
import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.app.common.props.SingleGroupRewardPoolCommon;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
@ -18,7 +15,6 @@ import com.red.circle.other.app.enums.violation.GameOriginEnum;
import com.red.circle.other.app.inner.service.material.props.PropsActivityClientService;
import com.red.circle.other.app.service.activity.RankingActivityService;
import com.red.circle.other.app.service.user.user.AppUserDataViolationService;
import com.red.circle.other.app.service.user.user.UserProfileService;
import com.red.circle.other.app.util.OfficialNoticeUtils;
import com.red.circle.other.domain.game.GameRankingIncrementCmd;
import com.red.circle.other.domain.gateway.PropCouponGateway;
@ -32,7 +28,6 @@ import com.red.circle.other.domain.ranking.RankingCycleType;
import com.red.circle.other.domain.ranking.RankingDimension;
import com.red.circle.other.infra.database.cache.service.other.EnumConfigCacheService;
import com.red.circle.other.infra.database.rds.entity.sys.GameListConfig;
import com.red.circle.other.infra.database.rds.entity.user.user.LatestMobileDevice;
import com.red.circle.other.infra.database.rds.entity.user.user.OneTimeTask;
import com.red.circle.other.infra.database.rds.service.activity.UserActivityRechargeService;
import com.red.circle.other.infra.database.rds.service.sys.GameListConfigService;
@ -43,7 +38,6 @@ import com.red.circle.other.inner.model.cmd.activity.SendActivityRewardCmd;
import com.red.circle.other.inner.model.cmd.user.ApprovalAccountCmd;
import com.red.circle.other.inner.model.dto.activity.props.ActivityPropsRule;
import com.red.circle.other.inner.model.dto.activity.props.ActivityRewardPropsDTO;
import com.red.circle.other.inner.model.dto.user.UserOneTimeTaskDTO;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.parse.DataTypeUtils;
import org.junit.Test;
@ -54,7 +48,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -108,7 +101,7 @@ public class SpringTest {
@Test
public void testActivityRuleConfig() {
List<ActivityRewardPropsDTO> rewardList = singleGroupRewardPoolCommon.listRewardProps("BZIZI", PropsActivityTypeEnum.CONSUMPTION_ACTIVITY);
List<ActivityRewardPropsDTO> rewardList = singleGroupRewardPoolCommon.listRewardProps(SysOriginPlatformEnum.ATYOU.name(), PropsActivityTypeEnum.CONSUMPTION_ACTIVITY);
System.out.println(rewardList);
}
@ -121,7 +114,7 @@ public class SpringTest {
@Test
public void testCompletedFirstCharge() {
completedFirstCharge(1957345312961527809L, "BZIZI");
completedFirstCharge(1957345312961527809L, SysOriginPlatformEnum.ATYOU.name());
}
private void completedFirstCharge(Long userId, String sysOrigin) {
@ -152,7 +145,7 @@ public class SpringTest {
public void testGameRanking() {
String gameId = "1083";
GameListConfig gameListConfig = gameListConfigService.getByGameId(gameId, GameOriginEnum.BAISHUN.name(), "BZIZI");
GameListConfig gameListConfig = gameListConfigService.getByGameId(gameId, GameOriginEnum.BAISHUN.name(), SysOriginPlatformEnum.ATYOU.name());
GameRankingIncrementCmd build = GameRankingIncrementCmd.builder()
.gameOrigin(GameOriginEnum.BAISHUN.name())
@ -177,7 +170,7 @@ public class SpringTest {
receiverCmd.setDimension(RankingDimension.GAME_WIN.getCode());
receiverCmd.setIncrementQuantity(111L);
receiverCmd.setBizNo("3243k1od");
receiverCmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
receiverCmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
rankingActivityService.accumulateRankingData(receiverCmd);
}
@ -207,7 +200,7 @@ public class SpringTest {
UserProfileDTO userProfile = userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(DataTypeUtils.toLong(userId)));
GameListConfig gameListConfig = gameListConfigService.getByGameId("1090", GameOriginEnum.LINGXIAN.name(), "BZIZI");
GameListConfig gameListConfig = gameListConfigService.getByGameId("1090", GameOriginEnum.LINGXIAN.name(), SysOriginPlatformEnum.ATYOU.name());
if (Objects.nonNull(gameListConfig)) {
Map<Object, Object> build = OfficialNoticeUtils.buildUserProfile(userProfile);
build.put("gameUrl", gameListConfig.getCover());
@ -215,7 +208,7 @@ public class SpringTest {
imGroupClient.sendMessageBroadcast(
BroadcastGroupMsgBodyCmd.builder()
.toPlatform(SysOriginPlatformEnum.BZIZI)
.toPlatform(SysOriginPlatformEnum.ATYOU)
.type(GroupMessageTypeEnum.GAME_BAISHUN_WIN)
.data(build)
.build()

12
rc-service/rc-service-other/other-start/src/test/java/TeamMonthBillTest.java
View File

@ -1,6 +1,4 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.red.circle.OtherServiceApplication;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.other.app.listener.team.TeamBillSettleListener;
@ -12,7 +10,6 @@ import com.red.circle.other.infra.database.mongo.entity.team.team.TeamBillCycle;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMemberTarget;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamPolicyManager;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamProfile;
import com.red.circle.other.infra.database.mongo.entity.user.region.SysRegionConfig;
import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
import com.red.circle.other.infra.database.mongo.service.team.team.TeamBillCycleService;
import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberTargetService;
@ -25,13 +22,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -102,7 +96,7 @@ public class TeamMonthBillTest {
TeamProfile teamProfile = teamProfileService.getById(teamId);
TeamBillCycle teamBillCycle = new TeamBillCycle();
teamBillCycle.setSysOrigin("BZIZI");
teamBillCycle.setSysOrigin(SysOriginPlatformEnum.ATYOU.name());
teamBillCycle.setRegion(teamProfile.getRegion());
teamBillCycle.setBillBelong(billBelong);
teamBillCycle.setTeamId(teamId);
@ -183,12 +177,12 @@ public class TeamMonthBillTest {
@Test
public void weeklyRewardsSent() {
weeklyRewardsSentManager.sendLastWeekStarV1(SysOriginPlatformEnum.BZIZI);
weeklyRewardsSentManager.sendLastWeekStarV1(SysOriginPlatformEnum.ATYOU);
}
@Test
public void weeklyKingQueenSent() {
weeklyRewardsSentManager.sendLastWeekKingQueen(SysOriginPlatformEnum.BZIZI);
weeklyRewardsSentManager.sendLastWeekKingQueen(SysOriginPlatformEnum.ATYOU);
}
}

4
rc-service/rc-service-other/other-start/src/test/java/TeamToFamilyScript.java
View File

@ -65,8 +65,8 @@ public class TeamToFamilyScript {
/**
* 系统来源
*/
private static final String SYS_ORIGIN = "BZIZI";
private static final String SYS_ORIGIN = "ATYOU";
/**
* 默认家族等级
*/

4
rc-service/rc-service-other/other-start/src/test/java/activity/CpRankingRewardTest.java
View File

@ -32,7 +32,7 @@ public class CpRankingRewardTest {
log.info("========== 开始测试发送上周周榜前三奖励 ==========");
try {
SysOriginPlatformEnum platform = SysOriginPlatformEnum.BZIZI;
SysOriginPlatformEnum platform = SysOriginPlatformEnum.ATYOU;
cpRankingRewardManager.sendLastWeekTopReward(platform);
@ -50,7 +50,7 @@ public class CpRankingRewardTest {
log.info("========== 开始测试发送上赛季前三奖励 ==========");
try {
SysOriginPlatformEnum platform = SysOriginPlatformEnum.BZIZI;
SysOriginPlatformEnum platform = SysOriginPlatformEnum.ATYOU;
cpRankingRewardTask.sendSeasonRankingReward();

3
rc-service/rc-service-other/other-start/src/test/java/statistics/GiftStatisticsTest.java
View File

@ -1,6 +1,7 @@
package statistics;
import com.red.circle.OtherServiceApplication;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.other.infra.database.mongo.entity.gift.GiftAcceptUser;
import com.red.circle.other.infra.database.mongo.entity.gift.GiftGiveRunningWater;
import lombok.extern.slf4j.Slf4j;
@ -142,7 +143,7 @@ public class GiftStatisticsTest {
public void testUserGiftStatisticsBySysOrigin() {
// TODO: 修改参数
Long targetUserId = 1234567890L;
String sysOrigin = "BZIZI"; // 系统来源
String sysOrigin = SysOriginPlatformEnum.ATYOU.name(); // 系统来源
Query query = new Query();
query.addCriteria(Criteria.where("acceptUsers.acceptUserId").is(targetUserId));

2
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/enums/FreightGoldToUsdRatioEnum.java
View File

@ -24,7 +24,7 @@ public enum FreightGoldToUsdRatioEnum {
*/
YOLO(6000),
LIKEI(10000),
BZIZI(10000),
ATYOU(10000),
LOTFUN(6000);
private final int ratio;

3
rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/wallet/impl/WalletDiamondClientServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.red.circle.wallet.inner.service.wallet.impl;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.framework.dto.PageResult;
import com.red.circle.tool.core.collection.CollectionUtils;
@ -111,7 +112,7 @@ public class WalletDiamondClientServiceImpl implements WalletDiamondClientServic
cmd.setAmount(amount);
cmd.setReqUserId(userId);
cmd.setReqTime(new Date());
cmd.setReqSysOrigin(ReqSysOrigin.of("BZIZI"));
cmd.setReqSysOrigin(ReqSysOrigin.of(SysOriginPlatformEnum.ATYOU.name()));
log.warn("【钻石转金币定时器】用户-{} 自动兑换金币量 {}", userId, cmd);
try {
userBankExchangeGoldCmdExe.executeDiamond(cmd);