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

Merge branch 'release/redis-memory-fix-20260521' of gitea.haiyihy.com:hy/chatapp3-java

Browse Source
This commit is contained in:
hy001 2026-05-21 11:19:21 +08:00
commit a48fddb613
57 changed files with 2458 additions and 790 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc-common-business/common-business-core/src/main/resources/i18n/messages.properties
View File

@ -62,8 +62,10 @@ ROOM_THEME_NOT_PASS.body=\u3010Room Custom Theme\u3011 The review failed.
BADGE_ACTIVATION.title=Badge activation
BADGE_ACTIVATION.body=You have received a new achievement badge, go check it out~
# cp\u5173\u7CFB\u89E3\u9664
CP_DISMISS.title=CP Dismiss
CP_DISMISS.body=${nickname} Dissolved the CP relationship with you
CP_DISMISS.title=CP Dismiss
CP_DISMISS.body=${nickname} Dissolved the CP relationship with you
CP_BLESS.title=Cp bless
CP_BLESS.body=${nickname} has sent you CP blessing gifts
# \u63A5\u6536\u8D35\u65CFvip
ACCEPT_NOBLE_VIP.title=Receiving nobles
ACCEPT_NOBLE_VIP.body=${nickname} gives you ${days} days of noble status~

10
rc-common-business/common-business-core/src/main/resources/i18n/messages_id.properties
View File

@ -80,9 +80,11 @@ AGREE_BD_LEADER_INVITE_AGENT.body=${userProfile} menerima undangan BD Anda
# BD leader\u53D1\u9001\u6210\u4E3ABD\u9080\u8BF7
BD_LEADER_SEND_INVITE_BD.title=Undangan BD
BD_LEADER_SEND_INVITE_BD.body=${userProfile}mengundang Anda untuk menjadi BD
# CP祝福通知
CP_BLESS.title=Cp memberkati
CP_BLESS.body=${nickname} Saya memberi Anda hadiah berkah ruang CP
# CP祝福通知
CP_DISMISS.title=CP Dismiss
CP_DISMISS.body=${nickname} Dissolved the CP relationship with you
CP_BLESS.title=Cp memberkati
CP_BLESS.body=${nickname} Saya memberi Anda hadiah berkah ruang CP
# 告白通知
USER_CONFESSION.title=Pengakuan pengguna
USER_CONFESSION.body=${nickname} mengaku padamu di dinding pengakuan
USER_CONFESSION.body=${nickname} mengaku padamu di dinding pengakuan

8
rc-common-business/common-business-core/src/main/resources/i18n/messages_tr.properties
View File

@ -58,8 +58,10 @@ ROOM_THEME_NOT_PASS.body=[Oda \u00F6zel temas\u0131] incelemede ba\u015Far\u0131
BADGE_ACTIVATION.title=Rozet aktivasyonu
BADGE_ACTIVATION.body=Yeni bir ba\u015Far\u0131 rozeti ald\u0131n\u0131z, gidip bir g\u00F6z at\u0131n ~
# cp\u5173\u7CFB\u89E3\u9664
CP_DISMISS.title=CP s\u00FCr\u00FCm\u00FC
CP_DISMISS.body= ${nickname} sizinle CP ili\u015Fkisini bozdu
CP_DISMISS.title=CP s\u00FCr\u00FCm\u00FC
CP_DISMISS.body= ${nickname} sizinle CP ili\u015Fkisini bozdu
CP_BLESS.title=Cp bless
CP_BLESS.body=${nickname} has sent you CP blessing gifts
# \u63A5\u6536\u8D35\u65CFvip
ACCEPT_NOBLE_VIP.title=Soylular al\u0131r
ACCEPT_NOBLE_VIP.body =${nickname} size ${days} g\u00FCnl\u00FCk asil stat\u00FCs\u00FC verir ~
@ -117,4 +119,4 @@ AGREE_BD_LEADER_INVITE_AGENT.title=Daveti kabul etmek
AGREE_BD_LEADER_INVITE_AGENT.body=${userProfile}, BD davetinizi kabul etti
# BD leader\u53D1\u9001\u6210\u4E3ABD\u9080\u8BF7
BD_LEADER_SEND_INVITE_BD.title=BD Davetiyesi
BD_LEADER_SEND_INVITE_BD.body=${userProfile} sizi BD olmaya davet ediyor
BD_LEADER_SEND_INVITE_BD.body=${userProfile} sizi BD olmaya davet ediyor

8
rc-common-business/common-business-core/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -61,8 +61,10 @@ ROOM_THEME_NOT_PASS.body=\u3010\u623F\u9593\u81EA\u5B9A\u7FA9\u4E3B\u984C\u3011\
BADGE_ACTIVATION.title=\u5FBD\u7AE0\u6FC0\u6D3B
BADGE_ACTIVATION.body=\u60A8\u5DF2\u7372\u5F97\u65B0\u7684\u6210\u5C31\u5FBD\u7AE0\uFF0C\u5FEB\u53BB\u770B\u770B\u5427~
# cp\u5173\u7CFB\u89E3\u9664
CP_DISMISS.title=CP \u89E3\u9664
CP_DISMISS.body= ${nickname} \u8207\u60A8\u89E3\u9664\u4E86 CP \u95DC\u4FC2
CP_DISMISS.title=CP \u89E3\u9664
CP_DISMISS.body= ${nickname} \u8207\u60A8\u89E3\u9664\u4E86 CP \u95DC\u4FC2
CP_BLESS.title=Cp \u795D\u798F
CP_BLESS.body=${nickname} \u7D66\u4F60\u5011\u9001\u4E86cp\u7A7A\u9593\u795D\u798F\u79AE\u7269
# \u63A5\u6536\u8D35\u65CFvip
ACCEPT_NOBLE_VIP.title=\u8CB4\u65CF\u63A5\u6536
ACCEPT_NOBLE_VIP.body =${nickname} \u8D08\u9001\u60A8 ${days} \u5929\u7684\u8CB4\u65CF\u8EAB\u4EFD~
@ -134,4 +136,4 @@ AGREE_BD_LEADER_INVITE_AGENT.title=\u63A5\u53D7\u9080\u8BF7
AGREE_BD_LEADER_INVITE_AGENT.body=${userProfile} \u63A5\u53D7BD\u9080\u8BF7
# BD leader\u53D1\u9001\u6210\u4E3ABD\u9080\u8BF7
BD_LEADER_SEND_INVITE_BD.title=BD\u9080\u8BF7
BD_LEADER_SEND_INVITE_BD.body=${userProfile} \u9080\u8BF7\u6210\u4E3ABD
BD_LEADER_SEND_INVITE_BD.body=${userProfile} \u9080\u8BF7\u6210\u4E3ABD

11
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/asserts/user/UserRelationErrorCode.java
View File

@ -70,9 +70,14 @@ public enum UserRelationErrorCode implements IResponseErrorCode {
/**
* CP关系不存在.
*/
CP_RELATIONSHIP_NOT_EXISTS(4313, "CP relationship does not exist"),
;
CP_RELATIONSHIP_NOT_EXISTS(4313, "CP relationship does not exist"),
/**
* 关系类型与用户性别不匹配.
*/
RELATION_TYPE_GENDER_NOT_MATCH(4314, "Relationship type does not match user gender"),
;
private final Integer code;

13
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/user/CpSimpleUserProfileCO.java
View File

@ -41,10 +41,15 @@ public class CpSimpleUserProfileCO implements Serializable {
*/
private String meUserNickname;
/**
* CP用户ID
*/
@JsonSerialize(using = ToStringSerializer.class)
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
private String relationType;
/**
* CP用户ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long cpUserId;
/**

45
rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/app/user/DatavRestController.java
View File

@ -16,10 +16,12 @@ import com.red.circle.other.inner.model.cmd.user.OnlineCountQryCmd;
import com.red.circle.other.inner.model.dto.user.ActiveUserCountryCodeDTO;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -40,6 +42,9 @@ public class DatavRestController extends BaseController {
private final CountryDashboardService countryDashboardService;
private final CountryDashboardDailyMetricService countryDashboardDailyMetricService;
private final CountryDashboardGameMetricService countryDashboardGameMetricService;
@Value("${red-circle.country-dashboard.query-enabled:true}")
private boolean countryDashboardQueryEnabled;
@GetMapping("/active/user-country-code")
public List<ActiveUserCountryCodeDTO> latestActiveUserCountryCode() {
@ -58,30 +63,45 @@ public class DatavRestController extends BaseController {
@GetMapping("/country-dashboard")
public CountryDashboardCO countryDashboard(CountryDashboardQryCmd cmd) {
if (!countryDashboardQueryEnabled) {
return emptyCountryDashboard(cmd);
}
return countryDashboardService.query(cmd);
}
@GetMapping("/country-dashboard/recharge-details")
public PageResult<CountryDashboardRechargeDetailCO> countryDashboardRechargeDetails(
CountryDashboardRechargeDetailQryCmd cmd) {
if (!countryDashboardQueryEnabled) {
return PageResult.newPageResult(0);
}
return countryDashboardService.pageRechargeDetails(cmd);
}
@GetMapping("/country-dashboard/game-metrics")
public PageResult<CountryDashboardGameMetricCO> countryDashboardGameMetrics(
CountryDashboardGameMetricQryCmd cmd) {
if (!countryDashboardQueryEnabled) {
return PageResult.newPageResult(0);
}
return countryDashboardGameMetricService.pageGameMetrics(cmd);
}
@GetMapping("/country-dashboard/game-metrics/games")
public PageResult<CountryDashboardGameMetricCO> countryDashboardGameMetricGames(
CountryDashboardGameMetricQryCmd cmd) {
if (!countryDashboardQueryEnabled) {
return PageResult.newPageResult(0);
}
return countryDashboardGameMetricService.pageGameSummaries(cmd);
}
@GetMapping("/country-dashboard/game-metrics/country-rank")
public List<CountryDashboardGameMetricCO> countryDashboardGameMetricCountryRanks(
CountryDashboardGameMetricQryCmd cmd) {
if (!countryDashboardQueryEnabled) {
return Collections.emptyList();
}
return countryDashboardGameMetricService.listGameCountryRanks(cmd);
}
@ -91,6 +111,9 @@ public class DatavRestController extends BaseController {
@RequestParam String endDate,
@RequestParam(value = "sysOrigin", defaultValue = "LIKEI") String sysOrigin,
@RequestParam(value = "statTimezones", required = false) String statTimezones) {
if (!countryDashboardQueryEnabled) {
return disabledCountryDashboardBackfill(startDate, endDate, sysOrigin);
}
LocalDate parsedStartDate = LocalDate.parse(startDate);
LocalDate parsedEndDate = LocalDate.parse(endDate);
List<String> refreshedTimezones = countryDashboardDailyMetricService.refreshRange(
@ -109,6 +132,9 @@ public class DatavRestController extends BaseController {
@RequestParam String endDate,
@RequestParam(value = "sysOrigin", defaultValue = "LIKEI") String sysOrigin,
@RequestParam(value = "statTimezones", required = false) String statTimezones) {
if (!countryDashboardQueryEnabled) {
return disabledCountryDashboardBackfill(startDate, endDate, sysOrigin);
}
LocalDate parsedStartDate = LocalDate.parse(startDate);
LocalDate parsedEndDate = LocalDate.parse(endDate);
List<String> refreshedTimezones = countryDashboardGameMetricService.refreshRange(
@ -121,4 +147,23 @@ public class DatavRestController extends BaseController {
"statTimezones", refreshedTimezones);
}
private CountryDashboardCO emptyCountryDashboard(CountryDashboardQryCmd cmd) {
return new CountryDashboardCO()
.setPeriodType(cmd.getPeriodType())
.setStartDate(cmd.getStartDate())
.setEndDate(cmd.getEndDate())
.setStatTimezone(cmd.getStatTimezone())
.setTotal(new com.red.circle.console.app.dto.clientobject.datav.CountryDashboardMetricCO())
.setRecords(Collections.emptyList());
}
private Map<String, Object> disabledCountryDashboardBackfill(String startDate, String endDate,
String sysOrigin) {
return Map.of(
"status", "disabled",
"startDate", startDate,
"endDate", endDate,
"sysOrigin", sysOrigin);
}
}

33
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/user/relation/CpRelationshipRestController.java
View File

@ -1,15 +1,16 @@
package com.red.circle.other.adapter.app.user.relation;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.other.app.command.user.LoveLetterQueryCmdExe;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterDetailCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterWallCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.other.app.command.user.LoveLetterQueryCmdExe;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterDetailCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterWallCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyIdQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRelationshipQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.loveletter.SendLoveLetterCmd;
import com.red.circle.other.app.service.user.relation.UserCpRelationService;
import lombok.RequiredArgsConstructor;
@ -51,9 +52,9 @@ public class CpRelationshipRestController extends BaseController {
* @eo.request-type formdata
*/
@GetMapping("/pair")
public List<CpPairUserProfileCO> getCpPairUserProfileCO(AppExtCommand cmd) {
return userCpRelationService.getCpPairUserProfileCO(cmd);
}
public List<CpPairUserProfileCO> getCpPairUserProfileCO(CpRelationshipQueryCmd cmd) {
return userCpRelationService.getCpPairUserProfileCO(cmd);
}
/**
* CP申请.
@ -103,9 +104,9 @@ public class CpRelationshipRestController extends BaseController {
* @eo.request-type formdata
*/
@GetMapping("/apply-id")
public String getCpApplyId(@Validated UserIdCmd cmd) {
return userCpRelationService.getCpApplyId(cmd);
}
public String getCpApplyId(@Validated CpApplyIdQueryCmd cmd) {
return userCpRelationService.getCpApplyId(cmd);
}
/**
* 发送CP告白信封.

28
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/user/user/UserCpCabinRestController.java
View File

@ -1,13 +1,13 @@
package com.red.circle.other.adapter.app.user.user;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import com.red.circle.other.app.service.user.user.UserCpCabinService;
import java.util.List;
import lombok.AllArgsConstructor;
@ -34,25 +34,25 @@ public class UserCpCabinRestController extends BaseController {
* cp小屋相关信息
*/
@GetMapping
public UserCpCabinCO getCpCabinInfo(UserIdCommonCmd cmd) {
return userCpCabinService.getCpCabinInfo(cmd);
}
public UserCpCabinCO getCpCabinInfo(UserCpCabinQueryCmd cmd) {
return userCpCabinService.getCpCabinInfo(cmd);
}
/**
* cp value.
*/
@GetMapping("/value")
public UserCpCabinValueCO getCpCabinValue(UserIdCommonCmd cmd) {
return userCpCabinService.getCpCabinValue(cmd);
}
public UserCpCabinValueCO getCpCabinValue(UserCpCabinQueryCmd cmd) {
return userCpCabinService.getCpCabinValue(cmd);
}
/**
* 获得最近两百条祝福记录,并标记为已读.
*/
@GetMapping("/list")
public UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserIdCommonCmd cmd) {
return userCpCabinService.getCpBlessRecordAndUpRead(cmd);
}
public UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserCpCabinQueryCmd cmd) {
return userCpCabinService.getCpBlessRecordAndUpRead(cmd);
}
/**
* cp小屋祝福列表分页列表
@ -62,4 +62,4 @@ public class UserCpCabinRestController extends BaseController {
return userCpCabinService.pageCpBlessRecord(cmd);
}
}
}

30
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/user/user/UserCpRightsRestController.java Normal file
View File

@ -0,0 +1,30 @@
package com.red.circle.other.adapter.app.user.user;
import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpRightsConfigCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRightsConfigQueryCmd;
import com.red.circle.other.app.service.user.user.UserCpCabinService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* CP rights.
*/
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/user/cp/rights", produces = MediaType.APPLICATION_JSON_VALUE)
public class UserCpRightsRestController extends BaseController {
private final UserCpCabinService userCpCabinService;
/**
* CP rights config.
*/
@GetMapping("/config")
public CpRightsConfigCO getCpRightsConfig(CpRightsConfigQueryCmd cmd) {
return userCpCabinService.getCpRightsConfig(cmd);
}
}

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

@ -1,24 +1,32 @@
package com.red.circle.other.app.command.user;
import com.google.common.collect.Sets;
import com.red.circle.external.inner.endpoint.message.ImMessageClient;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.service.user.user.UserProfileService;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.google.common.collect.Sets;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
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.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
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.model.user.UserProfile;
import com.red.circle.other.infra.common.user.UserGiftBackpackCommon;
import com.red.circle.other.infra.database.cache.service.cp.CpRelationshipCacheService;
import com.red.circle.other.infra.database.cache.service.user.UserCpValueCacheService;
import com.red.circle.other.infra.database.mongo.service.user.count.WeekCpValueCountService;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinAchieveService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinAchieveService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.collection.MapBuilder;
import com.red.circle.tool.core.date.TimestampUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@ -31,10 +39,10 @@ import org.springframework.stereotype.Component;
@RequiredArgsConstructor
public class DismissCpApplyCmdExe {
private final CpValueService cpValueService;
private final CpApplyService cpApplyService;
private final ImMessageClient imMessageClient;
private final CpRelationshipService cpRelationshipService;
private final CpValueService cpValueService;
private final CpApplyService cpApplyService;
private final OfficialNoticeClient officialNoticeClient;
private final CpRelationshipService cpRelationshipService;
private final UserGiftBackpackCommon userGiftBackpackCommon;
private final WeekCpValueCountService weekCpValueCountService;
private final UserCpValueCacheService userCpValueCacheService;
@ -43,20 +51,24 @@ public class DismissCpApplyCmdExe {
private final UserProfileGateway userProfileGateway;
private final CpRelationshipCacheService cpRelationshipCacheService;
public void execute(CpApplyDismissCmd cmd) {
var cpRelationship = cpRelationshipService.getByUserId(cmd.requiredReqUserId());
if (Objects.isNull(cpRelationship)) {
return;
}
// 更新申请状态为解散
cpApplyService.dismiss(cmd.requiredReqUserId());
// 更新CP关系为分手中，不删除数据
cpRelationshipService.updateToDismissing(cmd.requiredReqUserId(), cmd.getCpUserId());
cpRelationshipCacheService.remove(Arrays.asList(cmd.requiredReqUserId(), cmd.getCpUserId()));
public void execute(CpApplyDismissCmd cmd) {
String relationType = parseRelationType(cmd.getRelationType());
var cpRelationship = cpRelationshipService.getByUserId(
cmd.requiredReqUserId(), cmd.getCpUserId(), relationType);
if (Objects.isNull(cpRelationship)) {
return;
}
// 更新申请状态为解散
cpApplyService.dismiss(cmd.requiredReqUserId(), relationType);
// 更新CP关系为分手中，不删除数据
cpRelationshipService.updateToDismissing(cmd.requiredReqUserId(), cmd.getCpUserId(), relationType);
cpRelationshipCacheService.remove(Arrays.asList(cmd.requiredReqUserId(), cmd.getCpUserId()));
sendDismissNotice(cmd, relationType);
// 以下数据不删除，7天后由定时任务清理
// weekCpValueCountService.removeThisWeek(...)
@ -68,8 +80,40 @@ public class DismissCpApplyCmdExe {
}
private String getSendApplyUserId(CpApplyDismissCmd cmd) {
return cmd.requiredReqUserId().toString();
}
}
private String getSendApplyUserId(CpApplyDismissCmd cmd) {
return cmd.requiredReqUserId().toString();
}
private void sendDismissNotice(CpApplyDismissCmd cmd, String relationType) {
UserProfile userProfile = userProfileGateway.getByUserId(cmd.requiredReqUserId());
if (Objects.isNull(userProfile)) {
return;
}
long dismissEndTime = TimestampUtils.now().getTime() + (7 * 24 * 60 * 60 * 1000L);
officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder()
.toAccount(cmd.getCpUserId())
.noticeType(OfficialNoticeTypeEnum.CP_DISMISS)
.templateParam(MapBuilder.builder()
.put("nickname", userProfile.getUserNickname())
.put("userNickname", userProfile.getUserNickname())
.put("account", userProfile.getAccount())
.put("userAvatar", userProfile.getUserAvatar())
.put("countryCode", userProfile.getCountryCode())
.put("countryName", userProfile.getCountryName())
.put("relationType", relationType)
.put("dismissEndTime", dismissEndTime)
.build())
.expand(cmd.requiredReqUserId())
.build());
}
private String parseRelationType(String relationType) {
try {
return CpRelationshipType.normalize(relationType);
} catch (IllegalArgumentException ex) {
ResponseAssert.failure(CommonErrorCode.TYPE_IS_NOT_IN_SCOPE, "relationType is not supported.");
return CpRelationshipType.CP.name();
}
}
}

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

@ -13,10 +13,11 @@ import com.red.circle.other.infra.database.rds.entity.user.user.CpApply;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.other.inner.asserts.user.UserRelationErrorCode;
import com.red.circle.wallet.inner.endpoint.wallet.WalletGoldClient;
import com.red.circle.wallet.inner.model.cmd.GoldReceiptCmd;
@ -53,25 +54,27 @@ public class ProcessCpApplyCmd {
private void process(ProcessApplyCmd cmd) {
CpApply cpApply = cpApplyService.getById(cmd.getApplyId());
// 没有找到映射信息
ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_MAPPING_INFO, cpApply);
// 状态错误
// 没有找到映射信息
ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_MAPPING_INFO, cpApply);
String relationType = CpRelationshipType.normalize(cpApply.getRelationType());
// 状态错误
ResponseAssert.isTrue(CommonErrorCode.STATE_ERROR,
Objects.equals(cpApply.getStatus(), CpApplyStatus.WAIT.name()));
// 检查是否是复合申请
CpRelationship dismissingCp = cpRelationshipService.getDismissingCp(
cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId());
// 检查是否是复合申请
CpRelationship dismissingCp = cpRelationshipService.getDismissingCp(
cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId(), relationType);
boolean isReconcile = Objects.nonNull(dismissingCp);
if (!isReconcile) {
// 非复合申请：CP已存在
ResponseAssert.isFalse(UserRelationErrorCode.ME_OR_YOU_CP_EXISTED,
cpRelationshipService.existsCp(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId()));
// 非复合申请：CP已存在
ResponseAssert.isFalse(UserRelationErrorCode.ME_OR_YOU_CP_EXISTED,
cpRelationshipService.existsCp(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId(),
relationType));
// 检查CP数量限制（最多4个）
int senderCpCount = cpRelationshipService.countCp(cmd.requiredReqUserId());
int senderCpCount = cpRelationshipService.countCp(cpApply.getSendApplyUserId());
int receiverCpCount = cpRelationshipService.countCp(cpApply.getAcceptApplyUserId());
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, senderCpCount >= 4);
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, receiverCpCount >= 4);
@ -86,23 +89,24 @@ public class ProcessCpApplyCmd {
return;
}
refuseStatusWait(cmd, cpApply);
if (isReconcile) {
// 复合：更新状态为NORMAL
cpRelationshipService.reconcile(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId());
} else {
// 新建关系
cpRelationshipService
.addCp(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId(), createCpValue(),
cmd.requireReqSysOrigin());
refuseStatusWait(cmd, cpApply, relationType);
if (isReconcile) {
// 复合：更新状态为NORMAL
cpRelationshipService.reconcile(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId(),
relationType);
} else {
// 新建关系
cpRelationshipService
.addCp(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId(), createCpValue(),
cmd.requireReqSysOrigin(), relationType);
}
cpRelationshipCacheService.remove(Arrays.asList(cpApply.getSendApplyUserId(), cpApply.getAcceptApplyUserId()));
}
private void refuseStatusWait(ProcessApplyCmd cmd, CpApply cpApply) {
cpApplyService.refuseStatusWait(cmd.requiredReqUserId());
private void refuseStatusWait(ProcessApplyCmd cmd, CpApply cpApply, String relationType) {
cpApplyService.refuseStatusWait(cmd.requiredReqUserId(), relationType);
userMqMessageService.cpApplyDelayed(
new CpApplyEvent()
.setId(cpApply.getId())
@ -110,8 +114,13 @@ public class ProcessCpApplyCmd {
TimestampUtils.nowPlusMinutes(1));
}
private void returnGoldCoins(ProcessApplyCmd cmd, CpApply cpApply) {
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
private void returnGoldCoins(ProcessApplyCmd cmd, CpApply cpApply) {
if (Objects.isNull(cpApply.getApplyConsumeGold())
|| cpApply.getApplyConsumeGold().compareTo(BigDecimal.ZERO) <= 0) {
cpApplyService.changeStatusById(cmd.getApplyId(), CpApplyStatus.REIMBURSE);
return;
}
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
.appIncome()
.userId(cpApply.getSendApplyUserId())
.eventId(cpApply.getId())

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

@ -1,13 +1,14 @@
package com.red.circle.other.app.command.user;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.mq.business.model.event.user.CpApplyEvent;
import com.red.circle.mq.rocket.business.producer.UserMqMessageService;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
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.mq.business.model.event.user.CpApplyEvent;
import com.red.circle.mq.rocket.business.producer.UserMqMessageService;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.util.OfficialNoticeUtils;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
@ -15,32 +16,36 @@ import com.red.circle.other.domain.gateway.user.ability.UserRegionGateway;
import com.red.circle.other.infra.database.cache.service.other.EnumConfigCacheService;
import com.red.circle.other.infra.database.rds.entity.user.user.CpApply;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.other.inner.enums.config.EnumConfigKey;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.other.inner.asserts.user.UserRelationErrorCode;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.enums.config.EnumConfigKey;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.other.inner.asserts.user.UserRelationErrorCode;
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.dto.WalletReceiptResDTO;
import com.red.circle.wallet.inner.model.enums.GoldOrigin;
import java.util.Map;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import com.red.circle.wallet.inner.model.dto.WalletReceiptResDTO;
import com.red.circle.wallet.inner.model.enums.GoldOrigin;
import java.math.BigDecimal;
import java.util.Map;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* 发送cp申请.
*
* @author pengliang on 2021/7/13
*/
@Component
@RequiredArgsConstructor
public class SendCpApplyCmdExe {
@Component
@RequiredArgsConstructor
@Slf4j
public class SendCpApplyCmdExe {
private final CpApplyService cpApplyService;
private final OfficialNoticeClient officialNoticeClient;
@ -50,87 +55,135 @@ public class SendCpApplyCmdExe {
private final EnumConfigCacheService enumConfigCacheService;
private final UserProfileGateway userProfileGateway;
private final UserProfileAppConvertor userProfileAppConvertor;
private final UserRegionGateway userRegionGateway;
public void execute(CpApplyCmd cmd) {
// 不可用操作自己
ResponseAssert.isFalse(UserRelationErrorCode.UNAVAILABLE_OPS_YOURSELF,
Objects.equals(cmd.requiredReqUserId(), cmd.getAcceptApplyUserId()));
boolean eqRegion = userRegionGateway.checkEqRegion(cmd.requiredReqUserId(), cmd.getAcceptApplyUserId());
ResponseAssert.isTrue(UserRelationErrorCode.UNAVAILABLE_NOT_REGION, eqRegion);
// 检查是否是复合申请
CpRelationship dismissingCp = cpRelationshipService.getDismissingCp(
cmd.requiredReqUserId(), cmd.getAcceptApplyUserId());
boolean isReconcile = Objects.nonNull(dismissingCp);
if (!isReconcile) {
// 非复合申请：检查CP是否已存在
ResponseAssert.isFalse(UserRelationErrorCode.ME_OR_YOU_CP_EXISTED,
cpRelationshipService
.existsCp(cmd.requiredReqUserId(), cmd.getAcceptApplyUserId()));
// 检查CP数量限制（最多4个）
int senderCpCount = cpRelationshipService.countCp(cmd.requiredReqUserId());
int receiverCpCount = cpRelationshipService.countCp(cmd.getAcceptApplyUserId());
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, senderCpCount >= 4);
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, receiverCpCount >= 4);
}
// 您已发送申请
ResponseAssert.isFalse(UserRelationErrorCode.YOU_HAVE_SENT_AN_APPLICATION,
cpApplyService.existsNotProcessSendApply(cmd.requiredReqUserId()));
// 对方已向你发送申请
ResponseAssert.isFalse(UserRelationErrorCode.OTHER_SIDE_ALREADY_APPLIED,
cpApplyService.exists(cmd.requiredReqUserId(), cmd.getAcceptApplyUserId()));
UserProfileDTO userProfile = userProfileAppConvertor.toUserProfileDTO(userProfileGateway.getByUserId(cmd.requiredReqUserId()));
UserProfileDTO acceptUserProfile = userProfileAppConvertor.toUserProfileDTO(userProfileGateway.getByUserId(cmd.getAcceptApplyUserId()));
ResponseAssert.isFalse(UserRelationErrorCode.UNAVAILABLE_SAME_GENDER, Objects.equals(userProfile.getUserSex(), acceptUserProfile.getUserSex()));
WalletReceiptResDTO receipt = ResponseAssert.requiredSuccess(
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
.appExpenditure()
.userId(cmd.requiredReqUserId())
.eventId(cmd.getAcceptApplyUserIdString())
.sysOrigin(cmd.requireReqSysOrigin())
.origin(GoldOrigin.CP_BUILD)
.amount(enumConfigCacheService.getValueBigDecimal(EnumConfigKey.CP_PRICE,
cmd.requireReqSysOrigin()))
.build())
);
String applyText = isReconcile
? "User " + userProfile.getUserNickname() + " wants to reconcile with you; if you accept, you will be a couple again."
: "User " + userProfile.getUserNickname() + " confessed the feeling to you; if you accept, you will become a couple.";
CpApply cpApply = new CpApply()
.setSendApplyUserId(cmd.requiredReqUserId())
.setAcceptApplyUserId(cmd.getAcceptApplyUserId())
.setApplyText(applyText)
.setStatus(CpApplyStatus.WAIT.name())
.setApplyConsumeGold(receipt.getOpAmount().getDollarAmount());
cpApplyService.save(cpApply);
Map<Object, Object> map = OfficialNoticeUtils.buildUserProfile(userProfile);
map.put("applyType", isReconcile ? "RECONCILE" : "APPLY");
officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder()
.toAccount(cmd.getAcceptApplyUserId())
.noticeType(OfficialNoticeTypeEnum.CP_BUILD)
.templateParam(map)
.expand(cpApply.getId())
private final UserRegionGateway userRegionGateway;
public void execute(CpApplyCmd cmd) {
process(cmd.requiredReqUserId(), cmd.getAcceptApplyUserId(), cmd.requireReqSysOrigin(),
cmd.getRelationType(), true);
}
public boolean autoCreateFromCpGift(Long sendUserId, Long acceptUserId, String sysOrigin) {
try {
process(sendUserId, acceptUserId, sysOrigin, CpRelationshipType.CP.name(), false);
return true;
} catch (Exception ex) {
log.info("[CP] skip auto create cp apply from gift, sendUserId={}, acceptUserId={}, reason={}",
sendUserId, acceptUserId, ex.getMessage());
return false;
}
}
private void process(Long sendUserId, Long acceptUserId, String sysOrigin, String relationTypeValue,
boolean chargeGold) {
CpRelationshipType relationType = parseRelationType(relationTypeValue);
// 不可用操作自己
ResponseAssert.isFalse(UserRelationErrorCode.UNAVAILABLE_OPS_YOURSELF,
Objects.equals(sendUserId, acceptUserId));
boolean eqRegion = userRegionGateway.checkEqRegion(sendUserId, acceptUserId);
ResponseAssert.isTrue(UserRelationErrorCode.UNAVAILABLE_NOT_REGION, eqRegion);
UserProfileDTO userProfile = userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(sendUserId));
UserProfileDTO acceptUserProfile = userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(acceptUserId));
validateRelationTypeGender(relationType, userProfile, acceptUserProfile);
// 检查是否是复合申请
CpRelationship dismissingCp = cpRelationshipService.getDismissingCp(
sendUserId, acceptUserId, relationType.name());
boolean isReconcile = Objects.nonNull(dismissingCp);
if (!isReconcile) {
// 非复合申请：检查CP是否已存在
ResponseAssert.isFalse(UserRelationErrorCode.ME_OR_YOU_CP_EXISTED,
cpRelationshipService
.existsCp(sendUserId, acceptUserId, relationType.name()));
// 检查CP数量限制（最多4个）
int senderCpCount = cpRelationshipService.countCp(sendUserId);
int receiverCpCount = cpRelationshipService.countCp(acceptUserId);
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, senderCpCount >= 4);
ResponseAssert.isFalse(UserRelationErrorCode.CP_LIMIT_EXCEEDED, receiverCpCount >= 4);
}
// 您已发送申请
ResponseAssert.isFalse(UserRelationErrorCode.YOU_HAVE_SENT_AN_APPLICATION,
cpApplyService.existsNotProcessSendApply(sendUserId, relationType.name()));
// 对方已向你发送申请
ResponseAssert.isFalse(UserRelationErrorCode.OTHER_SIDE_ALREADY_APPLIED,
cpApplyService.exists(sendUserId, acceptUserId, relationType.name()));
BigDecimal applyConsumeGold = BigDecimal.ZERO;
if (chargeGold) {
WalletReceiptResDTO receipt = ResponseAssert.requiredSuccess(
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
.appExpenditure()
.userId(sendUserId)
.eventId(acceptUserId.toString())
.sysOrigin(sysOrigin)
.origin(GoldOrigin.CP_BUILD)
.amount(enumConfigCacheService.getValueBigDecimal(EnumConfigKey.CP_PRICE,
sysOrigin))
.build())
);
applyConsumeGold = receipt.getOpAmount().getDollarAmount();
}
String applyText = isReconcile
? "User " + userProfile.getUserNickname() + " wants to reconcile with you; if you accept, you will be "
+ relationType.applyTargetText() + " again."
: "User " + userProfile.getUserNickname() + " invited you; if you accept, you will become "
+ relationType.applyTargetText() + ".";
CpApply cpApply = new CpApply()
.setSendApplyUserId(sendUserId)
.setAcceptApplyUserId(acceptUserId)
.setRelationType(relationType.name())
.setApplyText(applyText)
.setStatus(CpApplyStatus.WAIT.name())
.setApplyConsumeGold(applyConsumeGold);
cpApplyService.save(cpApply);
Map<Object, Object> map = OfficialNoticeUtils.buildUserProfile(userProfile);
map.put("applyType", isReconcile ? "RECONCILE" : "APPLY");
map.put("relationType", relationType.name());
officialNoticeClient.send(NoticeExtTemplateTypeCmd.builder()
.toAccount(acceptUserId)
.noticeType(OfficialNoticeTypeEnum.CP_BUILD)
.templateParam(map)
.expand(cpApply.getId())
.build()
);
userMqMessageService.cpApplyDelayed(
new CpApplyEvent()
.setId(cpApply.getId())
.setSysOrigin(SysOriginPlatformEnum.valueOf(cmd.requireReqSysOrigin())),
TimestampUtils.nowPlusDays(1));
}
}
userMqMessageService.cpApplyDelayed(
new CpApplyEvent()
.setId(cpApply.getId())
.setSysOrigin(SysOriginPlatformEnum.valueOf(sysOrigin)),
TimestampUtils.nowPlusDays(1));
}
private CpRelationshipType parseRelationType(String relationTypeValue) {
try {
return CpRelationshipType.of(relationTypeValue);
} catch (IllegalArgumentException ex) {
ResponseAssert.failure(CommonErrorCode.TYPE_IS_NOT_IN_SCOPE, "relationType is not supported.");
return CpRelationshipType.CP;
}
}
private void validateRelationTypeGender(CpRelationshipType relationType, UserProfileDTO userProfile,
UserProfileDTO acceptUserProfile) {
if (Objects.equals(relationType, CpRelationshipType.CP)) {
ResponseAssert.isFalse(UserRelationErrorCode.UNAVAILABLE_SAME_GENDER,
Objects.equals(userProfile.getUserSex(), acceptUserProfile.getUserSex()));
return;
}
ResponseAssert.isTrue(UserRelationErrorCode.RELATION_TYPE_GENDER_NOT_MATCH,
relationType.genderMatched(userProfile.getUserSex(), acceptUserProfile.getUserSex()));
}
}

16
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/CpApplyIdQryExe.java
View File

@ -1,7 +1,8 @@
package com.red.circle.other.app.command.user.query;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyIdQueryCmd;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@ -17,10 +18,11 @@ public class CpApplyIdQryExe {
private final CpApplyService cpApplyService;
public String execute(UserIdCmd cmd) {
return Optional.ofNullable(cpApplyService.getId(cmd.requiredReqUserId(), cmd.getUserId()))
.map(String::valueOf)
.orElse(null);
}
public String execute(CpApplyIdQueryCmd cmd) {
return Optional.ofNullable(cpApplyService.getId(cmd.requiredReqUserId(), cmd.getUserId(),
CpRelationshipType.normalize(cmd.getRelationType())))
.map(String::valueOf)
.orElse(null);
}
}

12
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpBlessRecordQueryExe.java
View File

@ -8,10 +8,11 @@ import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.collection.CollectionUtils;
import java.util.List;
import java.util.Map;
@ -37,7 +38,8 @@ public class UserCpBlessRecordQueryExe {
public List<CpBlessRecordCO> execute(UserCpBlessRecordQueryCmd cmd) {
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(cmd.getUserId());
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(
cmd.getUserId(), CpRelationshipType.normalize(cmd.getRelationType()));
if (Objects.isNull(relationship)) {
return Lists.newArrayList();
}

104
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpCabinQueryExe.java
View File

@ -1,18 +1,16 @@
package com.red.circle.other.app.command.user.query;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.red.circle.common.business.core.enums.CommonErrorEnum;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.other.app.convertor.user.UserCpCabinConvertor;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.red.circle.other.app.convertor.user.UserCpCabinConvertor;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpCabinConfigCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.UserCpCabinSpecialMemberCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinSpecialCO;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinSpecialCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord;
import com.red.circle.other.infra.database.rds.entity.user.user.CpCabinConfig;
@ -20,17 +18,19 @@ import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinAchieveService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinConfigService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinConfigService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.num.NumUtils;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import com.red.circle.tool.core.num.NumUtils;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.AllArgsConstructor;
@ -55,32 +55,28 @@ public class UserCpCabinQueryExe {
private final CpCabinAchieveService cpCabinAchieveService;
private final CpRelationshipService cpRelationshipService;
public UserCpCabinCO execute(UserIdCommonCmd cmd) {
List<CpCabinConfig> cpCabinConfig = cpCabinConfigService.getCpCabinConfig(
cmd.getReqSysOrigin().getOrigin());
ResponseAssert.notEmpty(CommonErrorEnum.NOT_FOUND_MAPPING_INFO, cpCabinConfig);
List<CpCabinConfigCO> cpCabinConfigList = userCpCabinConvertor.toCpCabinConfigCO(cpCabinConfig);
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(cmd.getUserId());
Boolean selfCabin = Objects.equals(cmd.getUserId(), cmd.getReqUserId());
if (Objects.isNull(relationship)) {
UserCpCabinCO userCpCabinCO = new UserCpCabinCO();
CpPairUserProfileCO cpPairUserProfileCO = new CpPairUserProfileCO();
cpPairUserProfileCO.setMeUserProfile(userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(cmd.getReqUserId())));
userCpCabinCO.setCpPairUserProfileCO(cpPairUserProfileCO);
userCpCabinCO.setCpCabinConfigCO(cpCabinConfigList);
userCpCabinCO.setCheckSelfCabin(selfCabin);
userCpCabinCO.setCpValLastMonth(0L);
return userCpCabinCO;
}
CpValue cpValue = cpValueService.getById(relationship.getCpValId());
CpPairUserProfileCO cpPairUserProfileCO = new CpPairUserProfileCO();
cpPairUserProfileCO.setCpUserProfile(userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(relationship.getCpUserId())));
public UserCpCabinCO execute(UserCpCabinQueryCmd cmd) {
String relationType = CpRelationshipType.normalize(cmd.getRelationType());
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(
cmd.getUserId(), relationType);
Boolean selfCabin = Objects.equals(cmd.getUserId(), cmd.getReqUserId());
if (Objects.isNull(relationship)) {
return emptyCabin(selfCabin);
}
List<CpCabinConfig> cpCabinConfig = cpCabinConfigService.getCpCabinConfig(
cmd.getReqSysOrigin().getOrigin());
List<CpCabinConfigCO> cpCabinConfigList = CollectionUtils.isEmpty(cpCabinConfig)
? Collections.emptyList()
: userCpCabinConvertor.toCpCabinConfigCO(cpCabinConfig);
CpValue cpValue = cpValueService.getById(relationship.getCpValId());
CpPairUserProfileCO cpPairUserProfileCO = new CpPairUserProfileCO();
cpPairUserProfileCO.setRelationType(CpRelationshipType.normalize(relationship.getRelationType()));
cpPairUserProfileCO.setCpUserProfile(userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(relationship.getCpUserId())));
cpPairUserProfileCO.setMeUserProfile(userProfileAppConvertor.toUserProfileDTO(
userProfileGateway.getByUserId(relationship.getUserId())));
cpPairUserProfileCO.setDays(TimestampUtils.durationNowDays(relationship.getCreateTime()));
@ -101,10 +97,22 @@ public class UserCpCabinQueryExe {
.currentCpCabinConfigCO(currentCpCabin)
.checkSelfCabin(selfCabin)
.userCpCabinSpecial(specialCO)
.build();
}
private UserCpCabinSpecialCO getUserCpCabinSpecialCO(
.build();
}
private static UserCpCabinCO emptyCabin(Boolean selfCabin) {
return UserCpCabinCO.builder()
.cpVal("0")
.blessVal(0L)
.cpPairUserProfileCO(null)
.cpCabinConfigCO(Collections.emptyList())
.currentCpCabinConfigCO(null)
.userCpCabinSpecial(null)
.checkSelfCabin(Boolean.TRUE.equals(selfCabin))
.build();
}
private UserCpCabinSpecialCO getUserCpCabinSpecialCO(
CpRelationship relationship, CpPairUserProfileCO cpPairUserProfileCO,
CpCabinConfigCO currentCpCabin) {

20
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpCabinValueQueryExe.java
View File

@ -1,12 +1,13 @@
package com.red.circle.other.app.command.user.query;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.num.NumUtils;
import java.math.BigDecimal;
import java.util.Objects;
@ -27,9 +28,10 @@ public class UserCpCabinValueQueryExe {
private final CpValueService cpValueService;
private final CpRelationshipService cpRelationshipService;
public UserCpCabinValueCO execute(UserIdCommonCmd cmd) {
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(cmd.getUserId());
public UserCpCabinValueCO execute(UserCpCabinQueryCmd cmd) {
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(
cmd.getUserId(), CpRelationshipType.normalize(cmd.getRelationType()));
if (Objects.isNull(relationship)) {
return UserCpCabinValueCO.builder()
.blessVal(0L)

133
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpLightCmdExe.java
View File

@ -1,16 +1,16 @@
package com.red.circle.other.app.command.user.query;
import com.red.circle.common.business.core.enums.CommonErrorEnum;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.UserCpLightCmd;
import com.red.circle.other.app.service.user.relation.UserCpLightCacheService;
import java.util.Objects;
import com.red.circle.other.app.service.user.relation.UserCpRelationService;
import lombok.AllArgsConstructor;
import com.red.circle.common.business.core.enums.CommonErrorEnum;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.other.app.dto.cmd.user.relation.cp.UserCpLightCmd;
import com.red.circle.other.app.service.user.relation.UserCpLightCacheService;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import java.util.Objects;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -25,43 +25,44 @@ import org.springframework.stereotype.Component;
@AllArgsConstructor
public class UserCpLightCmdExe {
private final UserCpLightCacheService userCpLightCacheService;
private final UserCpRelationService userCpRelationService;
private final UserCpLightCacheService userCpLightCacheService;
private final CpRelationshipService cpRelationshipService;
public void execute(UserCpLightCmd cmd) {
if (StringUtils.isBlank(cmd.getNearUserId()) || Objects.equals(cmd.getNearUserId(), "null")) {
ResponseAssert.failure(CommonErrorEnum.DATA_PARSING_ERROR);
}
UserIdCmd userIdCmd = new UserIdCmd();
userIdCmd.setUserId(cmd.getReqUserId());
CpUserProfileCO cpUserProfileCO = userCpRelationService.getCpUser(userIdCmd);
// 如果cp用户是空，不点亮
if (Objects.isNull(cpUserProfileCO)) {
return;
}
// 如果cp不是旁边用户，不点亮
if (Objects.nonNull(cpUserProfileCO.getUserProfile().getId()) && !Objects.equals(cpUserProfileCO.getUserProfile().getId().toString(), cmd.getNearUserId())) {
return;
}
if (Objects.nonNull(cmd.getType()) && Objects.equals(cmd.getType(), "APPOINT")) {
userCpLightCacheService.lightCpUserAppoint(cmd.getReqUserId(),
Long.parseLong(cmd.getNearUserId()),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.lightCpUserAppoint(
Long.parseLong(cmd.getNearUserId()),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
} else {
userCpLightCacheService.lightCpUser(cmd.getReqUserId(),
Long.parseLong(cmd.getNearUserId()),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.lightCpUser(
Long.parseLong(cmd.getNearUserId()),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
Long nearUserId = Long.parseLong(cmd.getNearUserId());
CpRelationship cpRelationship = cpRelationshipService.getByUserId(
cmd.getReqUserId(), nearUserId, CpRelationshipType.normalize(cmd.getRelationType()));
// 如果cp用户是空，不点亮
if (Objects.isNull(cpRelationship)) {
return;
}
// 如果cp不是旁边用户，不点亮
if (Objects.nonNull(cpRelationship.getCpUserId()) && !Objects.equals(
cpRelationship.getCpUserId(), nearUserId)) {
return;
}
if (Objects.nonNull(cmd.getType()) && Objects.equals(cmd.getType(), "APPOINT")) {
userCpLightCacheService.lightCpUserAppoint(cmd.getReqUserId(),
nearUserId,
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.lightCpUserAppoint(
nearUserId,
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
} else {
userCpLightCacheService.lightCpUser(cmd.getReqUserId(),
nearUserId,
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.lightCpUser(
nearUserId,
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
}
}
@ -69,36 +70,36 @@ public class UserCpLightCmdExe {
if (StringUtils.isBlank(cmd.getNearUserId()) || Objects.equals(cmd.getNearUserId(), "null")) {
ResponseAssert.failure(CommonErrorEnum.DATA_PARSING_ERROR);
}
UserIdCmd userIdCmd = new UserIdCmd();
userIdCmd.setUserId(cmd.getReqUserId());
CpUserProfileCO cpUserProfileCO = userCpRelationService.getCpUser(userIdCmd);
// 如果cp用户是空，不点亮
if (Objects.isNull(cpUserProfileCO)) {
return;
}
Long nearUserId = Long.parseLong(cmd.getNearUserId());
CpRelationship cpRelationship = cpRelationshipService.getByUserId(
cmd.getReqUserId(), nearUserId, CpRelationshipType.normalize(cmd.getRelationType()));
// 如果cp用户是空，不点亮
if (Objects.isNull(cpRelationship)) {
return;
}
// 如果cp不是旁边用户，不点亮
/*if (Objects.nonNull(cpUserProfileCO.getUserProfile().getId()) && !Objects.equals(cpUserProfileCO.getUserProfile().getId().toString(), cmd.getNearUserId())) {
return;
}*/
if (Objects.nonNull(cmd.getType()) && Objects.equals(cmd.getType(), "APPOINT")) {
userCpLightCacheService.cancelCpUserAppoint(cmd.getReqUserId(),
cpUserProfileCO.getUserProfile().getId(),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.cancelCpUserAppoint(
cpUserProfileCO.getUserProfile().getId(),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
} else {
userCpLightCacheService.cancelCpUser(cmd.getReqUserId(),
cpUserProfileCO.getUserProfile().getId(),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.cancelCpUser(
cpUserProfileCO.getUserProfile().getId(),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
if (Objects.nonNull(cmd.getType()) && Objects.equals(cmd.getType(), "APPOINT")) {
userCpLightCacheService.cancelCpUserAppoint(cmd.getReqUserId(),
cpRelationship.getCpUserId(),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.cancelCpUserAppoint(
cpRelationship.getCpUserId(),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
} else {
userCpLightCacheService.cancelCpUser(cmd.getReqUserId(),
cpRelationship.getCpUserId(),
cmd.getReqSysOrigin().getOrigin());
userCpLightCacheService.cancelCpUser(
cpRelationship.getCpUserId(),
cmd.getReqUserId(),
cmd.getReqSysOrigin().getOrigin());
}
}
}

113
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpPairUserProfileQryExe.java
View File

@ -1,25 +1,27 @@
package com.red.circle.other.app.command.user.query;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.tool.core.date.DateUtils;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRelationshipQueryCmd;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.asserts.user.UserErrorCode;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import java.time.ZoneId;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.time.ZoneId;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import com.red.circle.tool.core.date.LocalDateTimeUtils;
import lombok.RequiredArgsConstructor;
@ -32,7 +34,9 @@ import org.springframework.stereotype.Component;
*/
@Component
@RequiredArgsConstructor
public class UserCpPairUserProfileQryExe {
public class UserCpPairUserProfileQryExe {
private static final long DISMISS_DURATION_MS = 7 * 24 * 60 * 60 * 1000L;
private final CpRelationshipService cpRelationshipService;
private final UserProfileGateway userProfileGateway;
@ -40,13 +44,16 @@ public class UserCpPairUserProfileQryExe {
private final CpValueService cpValueService;
private final TaskMqMessage taskMqMessage;
public List<CpPairUserProfileCO> execute(AppExtCommand cmd) {
UserProfile meUser = userProfileGateway.getByUserId(cmd.requiredReqUserId());
ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, meUser);
List<CpRelationship> cpRelationshipList = cpRelationshipService.getByUserId(cmd.requiredReqUserId());
List<CpRelationship> dismissing = cpRelationshipService.getDismissingByUserId(cmd.requiredReqUserId());
public List<CpPairUserProfileCO> execute(CpRelationshipQueryCmd cmd) {
String relationType = CpRelationshipType.normalize(cmd.getRelationType());
UserProfile meUser = userProfileGateway.getByUserId(cmd.requiredReqUserId());
ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, meUser);
List<CpRelationship> cpRelationshipList = cpRelationshipService.getByUserId(
cmd.requiredReqUserId(), relationType);
List<CpRelationship> dismissing = cpRelationshipService.getDismissingByUserId(
cmd.requiredReqUserId(), relationType);
cpRelationshipList.addAll(dismissing);
if (cpRelationshipList.isEmpty()) {
return Collections.emptyList();
@ -54,18 +61,48 @@ public class UserCpPairUserProfileQryExe {
return cpRelationshipList.stream()
.map(cpRelationship -> new CpPairUserProfileCO()
.setMeUserProfile(userProfileAppConvertor.toUserProfileDTO((meUser)))
.setCpUserProfile(getUserProfile(cpRelationship.getCpUserId()))
.setStatus(cpRelationship.getStatus())
.setCpValue(cpValueService.getCpVal(cpRelationship.getCpValId()))
.setDays(DateUtils.toDurationDays(cpRelationship.getCreateTime(), DateUtils.now()))
.setFirstDay(cpRelationship.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString()))
.sorted(Comparator.comparing(CpPairUserProfileCO::getCpValue).reversed())
.toList();
}
.setMeUserProfile(userProfileAppConvertor.toUserProfileDTO((meUser)))
.setCpUserProfile(getUserProfile(cpRelationship.getCpUserId()))
.setRelationType(relationType(cpRelationship))
.setStatus(cpRelationship.getStatus())
.setCpValue(cpValueService.getCpVal(cpRelationship.getCpValId()))
.setDays(relationshipDays(cpRelationship.getCreateTime()))
.setFirstDay(cpRelationship.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString())
.setDismissEndTime(dismissEndTime(cpRelationship))
.setDismissRemainSeconds(dismissRemainSeconds(cpRelationship)))
.sorted(Comparator.comparing(CpPairUserProfileCO::getCpValue).reversed())
.toList();
}
private UserProfileDTO getUserProfile(Long cpUserId) {
return userProfileAppConvertor.toUserProfileDTO(userProfileGateway
.getByUserId(cpUserId));
}
}
private UserProfileDTO getUserProfile(Long cpUserId) {
return userProfileAppConvertor.toUserProfileDTO(userProfileGateway
.getByUserId(cpUserId));
}
private static long relationshipDays(Date createTime) {
Date now = DateUtils.now();
if (!createTime.before(now)) {
return 0L;
}
return DateUtils.toDurationDays(createTime, now);
}
private static String relationType(CpRelationship cpRelationship) {
return CpRelationshipType.normalize(cpRelationship.getRelationType());
}
private static Long dismissEndTime(CpRelationship cpRelationship) {
if (Objects.isNull(cpRelationship.getDismissTime())) {
return null;
}
return cpRelationship.getDismissTime() + DISMISS_DURATION_MS;
}
private static Long dismissRemainSeconds(CpRelationship cpRelationship) {
Long dismissEndTime = dismissEndTime(cpRelationship);
if (Objects.isNull(dismissEndTime)) {
return null;
}
return Math.max(0L, (dismissEndTime - System.currentTimeMillis()) / 1000);
}
}

41
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpRelationQryExe.java
View File

@ -6,13 +6,15 @@ import com.red.circle.tool.core.date.DateUtils;
import com.red.circle.other.app.convertor.user.UserProfileAppConvertor;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.infra.database.cache.service.user.UserCpValueCacheService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.cache.service.user.UserCpValueCacheService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.other.inner.enums.user.UserCpLevelEnum;
import java.time.ZoneId;
import java.util.Optional;
import com.red.circle.other.inner.enums.user.UserCpLevelEnum;
import java.time.ZoneId;
import java.util.Date;
import java.util.Optional;
import com.red.circle.tool.core.date.LocalDateTimeUtils;
import com.red.circle.tool.core.date.ZonedId;
@ -35,20 +37,29 @@ public class UserCpRelationQryExe {
public CpUserProfileCO execute(UserIdCmd cmd) {
return Optional.ofNullable(cpRelationshipService.getByUserId(cmd.getReqUserId(), cmd.getUserId()))
.map(cpRelationship -> new CpUserProfileCO()
.setUserProfile(getUserProfile(cpRelationship.getCpUserId()))
.setDays(DateUtils.toDurationDays(cpRelationship.getCreateTime(), DateUtils.now()))
.map(cpRelationship -> new CpUserProfileCO()
.setUserProfile(getUserProfile(cpRelationship.getCpUserId()))
.setRelationType(CpRelationshipType.normalize(cpRelationship.getRelationType()))
.setDays(relationshipDays(cpRelationship.getCreateTime()))
.setFirstDay(cpRelationship.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString())
)
.orElse(null);
}
private UserProfileDTO getUserProfile(Long cpUserId) {
return userProfileAppConvertor.toUserProfileDTO(userProfileGateway
.getByUserId(cpUserId));
}
private UserCpLevelEnum getLevel(Long userId1, Long userId2) {
private UserProfileDTO getUserProfile(Long cpUserId) {
return userProfileAppConvertor.toUserProfileDTO(userProfileGateway
.getByUserId(cpUserId));
}
private static long relationshipDays(Date createTime) {
Date now = DateUtils.now();
if (!createTime.before(now)) {
return 0L;
}
return DateUtils.toDurationDays(createTime, now);
}
private UserCpLevelEnum getLevel(Long userId1, Long userId2) {
Long val = userCpValueCacheService.getValue(userId1, userId2);
if (val > 350000) {

12
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpRelationQueryV4Exe.java
View File

@ -19,8 +19,9 @@ import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinAchieveService;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinConfigService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.enums.user.UserCpLevelEnum;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.tool.core.collection.CollectionUtils;
@ -76,9 +77,10 @@ public class UserCpRelationQueryV4Exe {
cpCabinAchieveService.lastMonthCpVal(cpValue.getId()));
}
return buildUserCpCabinSpecialCO(CpCabinUserProfileCO.builder()
.userProfile(getUserProfile(cpRelationship.getCpUserId()))
.days(TimestampUtils.durationNowDays(cpRelationship.getCreateTime()))
return buildUserCpCabinSpecialCO(CpCabinUserProfileCO.builder()
.userProfile(getUserProfile(cpRelationship.getCpUserId()))
.relationType(CpRelationshipType.normalize(cpRelationship.getRelationType()))
.days(TimestampUtils.durationNowDays(cpRelationship.getCreateTime()))
.level(getLevel(cpRelationship.getUserId(), cpRelationship.getCpUserId()))
.currentCpCabinConfigCO(currentCpCabinConfigCO)
.cpCabinConfigCO(cpCabinConfigList)

141
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpRightsConfigQueryExe.java Normal file
View File

@ -0,0 +1,141 @@
package com.red.circle.other.app.command.user.query;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpRightsConfigCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRightsConfigQueryCmd;
import com.red.circle.other.infra.database.rds.entity.user.user.CpCabinConfig;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.entity.user.user.CpValue;
import com.red.circle.other.infra.database.rds.service.user.user.CpCabinConfigService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.IntStream;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
/**
* CP rights config query.
*/
@Component
@RequiredArgsConstructor
public class UserCpRightsConfigQueryExe {
private static final String RELATIONSHIP_STATUS_NONE = "NONE";
private final CpCabinConfigService cpCabinConfigService;
private final CpRelationshipService cpRelationshipService;
private final CpValueService cpValueService;
public CpRightsConfigCO execute(CpRightsConfigQueryCmd cmd) {
String relationType = CpRelationshipType.normalize(cmd.getRelationType());
CpRelationship relationship = findRelationship(cmd.getReqUserId(), cmd.getCpUserId(),
relationType);
Long intimacyValue = getIntimacyValue(relationship);
List<CpCabinConfig> configs = cpCabinConfigService.getCpCabinConfig(
cmd.getReqSysOrigin().getOrigin());
return CpRightsConfigCO.builder()
.relationType(relationType)
.cpUserId(resolveCpUserId(cmd.getReqUserId(), cmd.getCpUserId(), relationship))
.relationshipStatus(Objects.isNull(relationship) ? RELATIONSHIP_STATUS_NONE
: relationship.getStatus())
.intimacyValue(intimacyValue)
.levels(toLevels(relationType, configs, Objects.nonNull(relationship), intimacyValue))
.build();
}
private CpRelationship findRelationship(Long reqUserId, Long cpUserId, String relationType) {
if (Objects.isNull(reqUserId)) {
return null;
}
if (Objects.nonNull(cpUserId)) {
CpRelationship normal = cpRelationshipService.getByUserId(reqUserId, cpUserId,
relationType);
if (Objects.nonNull(normal)) {
return normal;
}
return cpRelationshipService.getDismissingCp(reqUserId, cpUserId, relationType);
}
return cpRelationshipService.getByUserIdOrCpUserId(reqUserId, relationType);
}
private Long getIntimacyValue(CpRelationship relationship) {
if (Objects.isNull(relationship)) {
return 0L;
}
CpValue cpValue = cpValueService.getById(relationship.getCpValId());
return Optional.ofNullable(cpValue)
.map(CpValue::getCpVal)
.map(BigDecimal::longValue)
.orElse(0L);
}
private Long resolveCpUserId(Long reqUserId, Long requestCpUserId, CpRelationship relationship) {
if (Objects.nonNull(requestCpUserId) || Objects.isNull(relationship)) {
return requestCpUserId;
}
if (Objects.equals(relationship.getUserId(), reqUserId)) {
return relationship.getCpUserId();
}
if (Objects.equals(relationship.getCpUserId(), reqUserId)) {
return relationship.getUserId();
}
return relationship.getCpUserId();
}
private List<CpRightsConfigCO.LevelCO> toLevels(String relationType, List<CpCabinConfig> configs,
boolean hasRelationship, Long intimacyValue) {
if (Objects.isNull(configs) || configs.isEmpty()) {
return Collections.emptyList();
}
return IntStream.range(0, configs.size())
.mapToObj(index -> toLevel(relationType, configs.get(index), index + 1, hasRelationship,
intimacyValue))
.toList();
}
private CpRightsConfigCO.LevelCO toLevel(String relationType, CpCabinConfig config, int level,
boolean hasRelationship, Long intimacyValue) {
Long requiredIntimacyValue = Optional.ofNullable(config.getCabinUnlockValue()).orElse(0L);
boolean unlocked = hasRelationship && Optional.ofNullable(intimacyValue).orElse(0L)
>= requiredIntimacyValue;
String levelName = StringUtils.defaultIfBlank(config.getName(), relationType + " Level "
+ level);
return CpRightsConfigCO.LevelCO.builder()
.level(level)
.levelName(levelName)
.requiredIntimacyValue(requiredIntimacyValue)
.unlocked(unlocked)
.rights(Collections.singletonList(toRight(relationType, config, level, levelName,
requiredIntimacyValue, unlocked)))
.build();
}
private CpRightsConfigCO.RightCO toRight(String relationType, CpCabinConfig config, int level,
String title, Long requiredIntimacyValue, boolean unlocked) {
return CpRightsConfigCO.RightCO.builder()
.rightKey(relationType + "_CABIN_LEVEL_" + level)
.icon(firstNotBlank(config.getCover(), config.getPersonCover(), config.getCardCover(),
config.getBackgroundCover(), config.getSourceMiniUrl(), config.getSourceUrl()))
.title(title)
.desc("Unlock when intimacy reaches " + requiredIntimacyValue)
.unlocked(unlocked)
.build();
}
private String firstNotBlank(String... values) {
for (String value : values) {
if (StringUtils.isNotBlank(value)) {
return value;
}
}
return null;
}
}

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

@ -5,20 +5,23 @@ import com.google.common.collect.Lists;
import com.red.circle.common.business.core.enums.GameStateEnum;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.enums.DynamicMessageEnum;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.mq.business.model.event.gift.OfflineProcessGiftEvent;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.external.inner.endpoint.message.OfficialNoticeClient;
import com.red.circle.external.inner.model.cmd.message.notice.official.NoticeExtTemplateTypeCmd;
import com.red.circle.external.inner.model.enums.message.OfficialNoticeTypeEnum;
import com.red.circle.mq.business.model.event.gift.OfflineProcessGiftEvent;
import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
import com.red.circle.mq.rocket.business.producer.UserMqMessageService;
import com.red.circle.other.app.common.game.GameIndoorTeamPkCommon;
import com.red.circle.other.app.common.gift.GameLuckyGiftCommon;
import com.red.circle.other.app.dto.clientobject.dynamic.MessageItemCO;
import com.red.circle.other.app.common.game.GameIndoorTeamPkCommon;
import com.red.circle.other.app.common.gift.GameLuckyGiftCommon;
import com.red.circle.other.app.command.user.SendCpApplyCmdExe;
import com.red.circle.other.app.dto.clientobject.dynamic.MessageItemCO;
import com.red.circle.other.app.dto.clientobject.game.GameRoomPkUserCO;
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.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;
@ -76,7 +79,8 @@ import com.red.circle.other.inner.enums.material.GiftSpecialEnum;
import com.red.circle.other.inner.enums.material.GiftTabEnum;
import com.red.circle.other.inner.enums.task.RoomDailyTaskCode;
import com.red.circle.other.inner.model.dto.material.GiftConfigDTO;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.collection.MapBuilder;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils;
import com.red.circle.tool.core.json.JacksonUtils;
@ -145,8 +149,9 @@ public class GiftCountStrategy implements GiftStrategy {
private final DynamicGiftService dynamicGiftService;
private final DynamicMessageService dynamicMessageService;
private static final List<String> inRegionCodes = List.of("IN", "PK", "BD");
private final UserRegionCacheService userRegionCacheService;
private final UserProfileGateway userProfileGateway;
private final UserRegionCacheService userRegionCacheService;
private final UserProfileGateway userProfileGateway;
private final SendCpApplyCmdExe sendCpApplyCmdExe;
@Override
@ -184,9 +189,12 @@ public class GiftCountStrategy implements GiftStrategy {
}
}
// 动态礼物处理
processDynamicGift(runningWater);
// 动态礼物处理
processDynamicGift(runningWater);
autoCreateCpApplyFromCpGift(runningWater);
saveBlessingsRecord(runningWater);
boolean isHighPriceGift = checkHighPriceGift(runningWater);
BigDecimal giftValueCount = BigDecimal.valueOf(getActualAmount(giftValue, giftValue.getGiftValue()));
@ -312,7 +320,7 @@ public class GiftCountStrategy implements GiftStrategy {
}
private void saveBlessingsRecord(GiftGiveRunningWater runningWater) {
private void saveBlessingsRecord(GiftGiveRunningWater runningWater) {
//log.warn("cptesttest saveBlessingsRecord:{},{}",Boolean.FALSE.equals(runningWater.getCheckBlessingsGift()),JacksonUtils.toJson(runningWater));
if (Boolean.FALSE.equals(runningWater.getCheckBlessingsGift())) {
return;
@ -357,17 +365,66 @@ public class GiftCountStrategy implements GiftStrategy {
cpValueService.incrBlessValue(cpValue.getId(), runningWater.getGiftValue().getGiftValue());
UserProfile userProfile = userProfileRepository.getByUserId(runningWater.getUserId());
// 发送祝福通知
/* officialService.send(NoticeExtTemplateTypeCmd.builder()
.toAccount(runningWater.getAcceptUsers().get(0).getAcceptUserId())
.noticeType(OfficialNoticeTypeEnum.CP_BLESS)
.templateParam(MapBuilder.builder()
.put("nickname", userProfile.getUserNickname())
.build())
.build());*/
}
sendCpBlessNotice(runningWater, cpRelationship, cache);
}
private void autoCreateCpApplyFromCpGift(GiftGiveRunningWater runningWater) {
try {
if (Objects.isNull(runningWater) || Objects.isNull(runningWater.getGiftValue())
|| !isCpGift(runningWater.getGiftValue())) {
return;
}
if (CollectionUtils.isEmpty(runningWater.getAcceptUsers())) {
return;
}
runningWater.getAcceptUsers().forEach(accept -> {
if (Objects.equals(runningWater.getUserId(), accept.getAcceptUserId())) {
return;
}
sendCpApplyCmdExe.autoCreateFromCpGift(
runningWater.getUserId(), accept.getAcceptUserId(), runningWater.getSysOrigin());
});
} catch (Exception ex) {
log.warn("[CP] skip auto create cp apply from gift, runningWaterId={}, giftId={}, sendUserId={}, reason={}",
Objects.nonNull(runningWater) ? runningWater.getId() : null,
Objects.nonNull(runningWater) ? runningWater.getGiftId() : null,
Objects.nonNull(runningWater) ? runningWater.getUserId() : null,
ex.getMessage());
}
}
private void sendCpBlessNotice(GiftGiveRunningWater runningWater, CpRelationship cpRelationship,
GiftConfigDTO giftConfig) {
UserProfile userProfile = userProfileRepository.getByUserId(runningWater.getUserId());
if (Objects.isNull(userProfile)) {
return;
}
List<Long> toAccounts = Lists.newArrayList(cpRelationship.getUserId(), cpRelationship.getCpUserId())
.stream()
.filter(Objects::nonNull)
.distinct()
.toList();
if (CollectionUtils.isEmpty(toAccounts)) {
return;
}
officialService.send(NoticeExtTemplateTypeCmd.builder()
.toAccounts(toAccounts)
.noticeType(OfficialNoticeTypeEnum.CP_BLESS)
.templateParam(MapBuilder.builder()
.put("nickname", userProfile.getUserNickname())
.put("userNickname", userProfile.getUserNickname())
.put("account", userProfile.getAccount())
.put("userAvatar", userProfile.getUserAvatar())
.put("countryCode", userProfile.getCountryCode())
.put("countryName", userProfile.getCountryName())
.put("giftCover", giftConfig.getGiftPhoto())
.put("giftCount", runningWater.getGiftValue().getQuantity())
.put("relationType", cpRelationship.getRelationType())
.build())
.expand(cpRelationship.getCpValId())
.build());
}
/**

9
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/user/CpApplyListener.java
View File

@ -74,8 +74,13 @@ public class CpApplyListener implements MessageListener {
cpApplies.forEach(apply -> reimburse(param, apply));
}
private void reimburse(CpApplyEvent param, CpApply cpApply) {
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
private void reimburse(CpApplyEvent param, CpApply cpApply) {
if (Objects.isNull(cpApply.getApplyConsumeGold())
|| cpApply.getApplyConsumeGold().signum() <= 0) {
cpApplyService.changeStatusById(cpApply.getId(), CpApplyStatus.REIMBURSE);
return;
}
walletGoldClient.changeBalance(GoldReceiptCmd.builder()
.appIncome()
.userId(cpApply.getSendApplyUserId())
.eventId(cpApply.getId())

78
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/user/OnlineStatusUploadListener.java
View File

@ -26,11 +26,11 @@ import com.red.circle.tool.core.date.DateUtils;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.parse.DataTypeUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.wallet.inner.endpoint.wallet.WalletGoldClient;
import java.sql.Timestamp;
import java.util.Objects;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import com.red.circle.wallet.inner.endpoint.wallet.WalletGoldClient;
import java.sql.Timestamp;
import java.util.Objects;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -108,21 +108,59 @@ public class OnlineStatusUploadListener implements MessageListener {
}
);
}
private void countActiveUser(UserProfile userProfile) {
long account = Objects.hash(userProfile.getAccount());
if (userProfileGateway.checkTeamMember(userProfile.getId())) {
countUserActiveIndexService.countAnchorActiveUser(account);
countUserActiveIndexService.countAnchorActiveUser(userProfile.getOriginSys(), account);
return;
}
countUserActiveIndexService.countOrdinaryActiveUser(account);
countUserActiveIndexService.countOrdinaryActiveUser(userProfile.getOriginSys(), account);
}
private void addOnlineUser(UserOnlineStatusEvent event, UserProfile userProfile) {
}
private void countActiveUser(UserProfile userProfile) {
Long bitmapOffset = resolveActiveUserBitmapOffset(userProfile);
if (Objects.isNull(bitmapOffset) || bitmapOffset <= 0) {
log.warn("[在线状态]跳过活跃bitmap统计, userId={}, account={}, actualAccount={}",
userProfile.getId(),
userProfile.getAccount(),
userProfile.getActualAccount());
return;
}
if (userProfileGateway.checkTeamMember(userProfile.getId())) {
countUserActiveIndexService.countAnchorActiveUser(bitmapOffset);
countUserActiveIndexService.countAnchorActiveUser(userProfile.getOriginSys(), bitmapOffset);
return;
}
countUserActiveIndexService.countOrdinaryActiveUser(bitmapOffset);
countUserActiveIndexService.countOrdinaryActiveUser(userProfile.getOriginSys(), bitmapOffset);
}
static Long resolveActiveUserBitmapOffset(UserProfile userProfile) {
if (Objects.isNull(userProfile)) {
return null;
}
Long offset = parsePositiveLong(userProfile.getAccount());
if (Objects.nonNull(offset)) {
return offset;
}
offset = parsePositiveLong(userProfile.getActualAccount());
if (Objects.nonNull(offset)) {
return offset;
}
return Optional.ofNullable(userProfile.getId())
.filter(id -> id > 0)
.orElse(null);
}
private static Long parsePositiveLong(String value) {
if (StringUtils.isBlank(value)) {
return null;
}
try {
long parsed = Long.parseLong(value.trim());
return parsed > 0 ? parsed : null;
} catch (NumberFormatException ignore) {
return null;
}
}
private void addOnlineUser(UserOnlineStatusEvent event, UserProfile userProfile) {
if (StringUtils.isBlank(event.getSessionId())) {
return;
}

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

@ -79,7 +79,7 @@ public class ActivityCorrectionDataManager {
log.warn("correctionActivityData:CHARM_RANK_MONTH-完成");
// cp
CpRelationship cpRelationship = cpRelationshipService.getByUserId(userId, null);
CpRelationship cpRelationship = cpRelationshipService.getByUserId(userId, (Long) null);
if (Objects.nonNull(cpRelationship)) {
BigDecimal cpVal = cpValueService.getCpVal(cpRelationship.getCpValId());

51
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/relation/UserCpRelationServiceImpl.java
View File

@ -1,8 +1,7 @@
package com.red.circle.other.app.service.user.relation;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.command.user.DismissCpApplyCmdExe;
import com.red.circle.other.app.command.user.LoveLetterQueryCmdExe;
import com.red.circle.other.app.command.user.ProcessCpApplyCmd;
@ -13,19 +12,22 @@ import com.red.circle.other.app.command.user.query.UserCpPairUserProfileQryExe;
import com.red.circle.other.app.command.user.query.UserCpRelationQryExe;
import com.red.circle.other.app.command.user.query.UserCpRelationQueryV4Exe;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpCabinUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterDetailCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyIdQueryCmd;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterDetailCO;
import com.red.circle.other.domain.model.cp.loveletter.LoveLetterWallCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.loveletter.SendLoveLetterCmd;
import com.red.circle.other.app.util.DistributedLockUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRelationshipQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.loveletter.SendLoveLetterCmd;
import com.red.circle.other.app.util.DistributedLockUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* 用户cp关系实现.
@ -53,13 +55,14 @@ public class UserCpRelationServiceImpl implements UserCpRelationService {
}
@Override
public List<CpPairUserProfileCO> getCpPairUserProfileCO(AppExtCommand cmd) {
return userCpPairUserProfileQryExe.execute(cmd);
}
public List<CpPairUserProfileCO> getCpPairUserProfileCO(CpRelationshipQueryCmd cmd) {
return userCpPairUserProfileQryExe.execute(cmd);
}
@Override
public void sendApply(CpApplyCmd cmd) {
String key = "SEND_CP_APPLY:" + cmd.getReqUserId() + "_" + cmd.getAcceptApplyUserId();
@Override
public void sendApply(CpApplyCmd cmd) {
String key = "SEND_CP_APPLY:" + Objects.toString(cmd.getRelationType(), "CP")
+ "_" + cmd.getReqUserId() + "_" + cmd.getAcceptApplyUserId();
distributedLockUtil.executeWithLock(key, () -> {
sendCpApplyCmdExe.execute(cmd);
});
@ -79,9 +82,9 @@ public class UserCpRelationServiceImpl implements UserCpRelationService {
}
@Override
public String getCpApplyId(UserIdCmd cmd) {
return cpApplyIdQryExe.execute(cmd);
}
public String getCpApplyId(CpApplyIdQueryCmd cmd) {
return cpApplyIdQryExe.execute(cmd);
}
@Override
public CpCabinUserProfileCO getCpUserV4(UserIdCommonCmd cmd) {

22
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/CpBlessRecordAndUpReadExe.java
View File

@ -1,17 +1,18 @@
package com.red.circle.other.app.service.user.user;
import com.google.common.collect.Lists;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.convertor.user.CpBlessRecordConvert;
import com.red.circle.other.app.convertor.user.UserCpCabinConvertor;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.convertor.user.CpBlessRecordConvert;
import com.red.circle.other.app.convertor.user.UserCpCabinConvertor;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.tool.core.collection.CollectionUtils;
import java.util.List;
import java.util.Map;
@ -36,7 +37,7 @@ public class CpBlessRecordAndUpReadExe {
private final CpRelationshipService cpRelationshipService;
private final CpBlessRecordConvert cpBlessRecordConvert;
public UserCpCabinUnreadCO execute(UserIdCommonCmd cmd) {
public UserCpCabinUnreadCO execute(UserCpCabinQueryCmd cmd) {
if (!Objects.equals(cmd.getReqUserId(), cmd.getUserId())) {
return UserCpCabinUnreadCO.builder()
@ -45,7 +46,8 @@ public class CpBlessRecordAndUpReadExe {
.build();
}
CpRelationship relationship = cpRelationshipService.getByUserId(cmd.getReqUserId(), cmd.getUserId());
CpRelationship relationship = cpRelationshipService.getByUserIdOrCpUserId(
cmd.getUserId(), CpRelationshipType.normalize(cmd.getRelationType()));
if (Objects.isNull(relationship)) {
return UserCpCabinUnreadCO.builder()
.topClassRecords(Lists.newArrayList())

69
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserCpCabinServiceImpl.java
View File

@ -1,16 +1,19 @@
package com.red.circle.other.app.service.user.user;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.command.user.query.UserCpBlessRecordQueryExe;
import com.red.circle.other.app.command.user.query.UserCpCabinQueryExe;
import com.red.circle.other.app.command.user.query.UserCpCabinValueQueryExe;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import java.util.List;
import com.red.circle.other.app.command.user.query.UserCpBlessRecordQueryExe;
import com.red.circle.other.app.command.user.query.UserCpCabinQueryExe;
import com.red.circle.other.app.command.user.query.UserCpCabinValueQueryExe;
import com.red.circle.other.app.command.user.query.UserCpRightsConfigQueryExe;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpRightsConfigCO;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRightsConfigQueryCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import java.util.List;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@ -23,27 +26,33 @@ import org.springframework.stereotype.Service;
public class UserCpCabinServiceImpl implements UserCpCabinService {
private final UserCpCabinQueryExe userCpCabinQueryExe;
private final UserCpCabinValueQueryExe userCpCabinValueQueryExe;
private final CpBlessRecordAndUpReadExe cpBlessRecordAndUpReadExe;
private final UserCpBlessRecordQueryExe userCpBlessRecordQueryExe;
private final UserCpCabinValueQueryExe userCpCabinValueQueryExe;
private final CpBlessRecordAndUpReadExe cpBlessRecordAndUpReadExe;
private final UserCpBlessRecordQueryExe userCpBlessRecordQueryExe;
private final UserCpRightsConfigQueryExe userCpRightsConfigQueryExe;
@Override
public UserCpCabinCO getCpCabinInfo(UserIdCommonCmd cmd) {
return userCpCabinQueryExe.execute(cmd);
}
public UserCpCabinCO getCpCabinInfo(UserCpCabinQueryCmd cmd) {
return userCpCabinQueryExe.execute(cmd);
}
@Override
public UserCpCabinValueCO getCpCabinValue(UserCpCabinQueryCmd cmd) {
return userCpCabinValueQueryExe.execute(cmd);
}
@Override
public UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserCpCabinQueryCmd cmd) {
return cpBlessRecordAndUpReadExe.execute(cmd);
}
@Override
public UserCpCabinValueCO getCpCabinValue(UserIdCommonCmd cmd) {
return userCpCabinValueQueryExe.execute(cmd);
}
@Override
public UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserIdCommonCmd cmd) {
return cpBlessRecordAndUpReadExe.execute(cmd);
}
@Override
public List<CpBlessRecordCO> pageCpBlessRecord(UserCpBlessRecordQueryCmd cmd) {
return userCpBlessRecordQueryExe.execute(cmd);
}
}
public List<CpBlessRecordCO> pageCpBlessRecord(UserCpBlessRecordQueryCmd cmd) {
return userCpBlessRecordQueryExe.execute(cmd);
}
@Override
public CpRightsConfigCO getCpRightsConfig(CpRightsConfigQueryCmd cmd) {
return userCpRightsConfigQueryExe.execute(cmd);
}
}

52
rc-service/rc-service-other/other-application/src/test/java/com/red/circle/other/app/listener/user/OnlineStatusUploadListenerTest.java Normal file
View File

@ -0,0 +1,52 @@
package com.red.circle.other.app.listener.user;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import com.red.circle.other.domain.model.user.OwnSpecialId;
import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.tool.core.date.TimestampUtils;
import org.junit.jupiter.api.Test;
class OnlineStatusUploadListenerTest {
@Test
void resolveActiveUserBitmapOffset_shouldUseNumericAccount() {
UserProfile profile = new UserProfile();
profile.setId(9988L);
profile.setAccount("123456");
assertEquals(123456L, OnlineStatusUploadListener.resolveActiveUserBitmapOffset(profile));
}
@Test
void resolveActiveUserBitmapOffset_shouldFallbackToNumericSpecialAccount() {
UserProfile profile = new UserProfile();
profile.setId(9988L);
profile.setAccount("abc");
OwnSpecialId ownSpecialId = new OwnSpecialId();
ownSpecialId.setAccount("654321");
ownSpecialId.setExpiredTime(TimestampUtils.nowPlusDays(1));
profile.setOwnSpecialId(ownSpecialId);
assertEquals(654321L, OnlineStatusUploadListener.resolveActiveUserBitmapOffset(profile));
}
@Test
void resolveActiveUserBitmapOffset_shouldFallbackToUserIdWhenAccountIsNotNumeric() {
UserProfile profile = new UserProfile();
profile.setId(9988L);
profile.setAccount("abc");
assertEquals(9988L, OnlineStatusUploadListener.resolveActiveUserBitmapOffset(profile));
}
@Test
void resolveActiveUserBitmapOffset_shouldReturnNullWhenNoPositiveCandidateExists() {
UserProfile profile = new UserProfile();
profile.setId(0L);
profile.setAccount("abc");
assertNull(OnlineStatusUploadListener.resolveActiveUserBitmapOffset(profile));
}
}

11
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/user/relation/cp/CpCabinUserProfileCO.java
View File

@ -31,9 +31,14 @@ public class CpCabinUserProfileCO extends ClientObject {
*/
private UserProfileDTO userProfile;
/**
* 组建天数.
*/
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
private String relationType;
/**
* 组建天数.
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long days;

38
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/user/relation/cp/CpPairUserProfileCO.java
View File

@ -33,10 +33,15 @@ public class CpPairUserProfileCO extends ClientObject {
private UserProfileDTO cpUserProfile;
/**
* CP关系状态（NORMAL-正常, DISMISSING-分手中）
*/
private String status;
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
private String relationType;
/**
* CP关系状态（NORMAL-正常, DISMISSING-分手中）
*/
private String status;
/**
* 心动值
@ -49,10 +54,21 @@ public class CpPairUserProfileCO extends ClientObject {
@JsonSerialize(using = ToStringSerializer.class)
private Long days;
/**
* 开始组件的日期
*/
private String firstDay;
}
/**
* 开始组件的日期
*/
private String firstDay;
/**
* 解除冷静期结束时间戳.
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long dismissEndTime;
/**
* 解除冷静期剩余秒数.
*/
private Long dismissRemainSeconds;
}

116
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/user/relation/cp/CpRightsConfigCO.java Normal file
View File

@ -0,0 +1,116 @@
package com.red.circle.other.app.dto.clientobject.user.relation.cp;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.red.circle.framework.dto.ClientObject;
import java.io.Serial;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* CP rights config.
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class CpRightsConfigCO extends ClientObject {
@Serial
private static final long serialVersionUID = 1L;
/**
* Relationship type: CP/BROTHER/SISTERS.
*/
private String relationType;
/**
* Relationship user id.
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long cpUserId;
/**
* NORMAL/DISMISSING/NONE.
*/
private String relationshipStatus;
/**
* Current intimacy value.
*/
private Long intimacyValue;
/**
* Level rights config.
*/
private List<LevelCO> levels;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class LevelCO {
/**
* Level number.
*/
private Integer level;
/**
* Level display name.
*/
private String levelName;
/**
* Required intimacy value.
*/
private Long requiredIntimacyValue;
/**
* Whether current relationship has unlocked this level.
*/
private Boolean unlocked;
/**
* Rights under this level.
*/
private List<RightCO> rights;
}
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class RightCO {
/**
* Stable right key.
*/
private String rightKey;
/**
* Right icon.
*/
private String icon;
/**
* Right title.
*/
private String title;
/**
* Right description.
*/
private String desc;
/**
* Whether current relationship has unlocked this right.
*/
private Boolean unlocked;
}
}

13
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/user/relation/cp/CpUserProfileCO.java
View File

@ -26,10 +26,15 @@ public class CpUserProfileCO extends ClientObject {
*/
private UserProfileDTO userProfile;
/**
* 组建天数.
*/
@JsonSerialize(using = ToStringSerializer.class)
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
private String relationType;
/**
* 组建天数.
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long days;
/**

14
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/CpApplyCmd.java
View File

@ -23,11 +23,15 @@ public class CpApplyCmd extends AppExtCommand {
*
* @eo.required
*/
@NotNull(message = "acceptApplyUserId required.")
private Long acceptApplyUserId;
public String getAcceptApplyUserIdString() {
@NotNull(message = "acceptApplyUserId required.")
private Long acceptApplyUserId;
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
public String getAcceptApplyUserIdString() {
return getAcceptApplyUserId().toString();
}

13
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/CpApplyDismissCmd.java
View File

@ -22,7 +22,12 @@ public class CpApplyDismissCmd extends AppExtCommand {
/**
* cp用户id
*/
@NotNull
private Long cpUserId;
}
@NotNull
private Long cpUserId;
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

18
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/CpApplyIdQueryCmd.java Normal file
View File

@ -0,0 +1,18 @@
package com.red.circle.other.app.dto.cmd.user.relation.cp;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* CP apply id query.
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CpApplyIdQueryCmd extends UserIdCmd {
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

20
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/CpRelationshipQueryCmd.java Normal file
View File

@ -0,0 +1,20 @@
package com.red.circle.other.app.dto.cmd.user.relation.cp;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* CP relationship query.
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
public class CpRelationshipQueryCmd extends AppExtCommand {
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

26
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/CpRightsConfigQueryCmd.java Normal file
View File

@ -0,0 +1,26 @@
package com.red.circle.other.app.dto.cmd.user.relation.cp;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.red.circle.framework.core.dto.AppCommand;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* CP rights config query.
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CpRightsConfigQueryCmd extends AppCommand {
/**
* Relationship type: CP/BROTHER/SISTERS, defaults to CP.
*/
private String relationType;
/**
* Optional relationship user id. If absent, only config can be returned safely.
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long cpUserId;
}

13
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/relation/cp/UserCpLightCmd.java
View File

@ -26,7 +26,12 @@ public class UserCpLightCmd extends AppCommand {
/**
* 点亮类型.APPOINT指定礼物，SPECIAL特效礼物
*/
@NotNull(message = "type required.")
private String type;
}
@NotNull(message = "type required.")
private String type;
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

9
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/user/UserCpBlessRecordQueryCmd.java
View File

@ -20,5 +20,10 @@ public class UserCpBlessRecordQueryCmd extends AppCommand {
/**
* 最后一条记录id.
*/
private Long lastId;
}
private Long lastId;
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

18
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/user/user/UserCpCabinQueryCmd.java Normal file
View File

@ -0,0 +1,18 @@
package com.red.circle.other.app.dto.cmd.user.user;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* CP cabin query.
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class UserCpCabinQueryCmd extends UserIdCommonCmd {
/**
* 关系类型：CP/BROTHER/SISTERS，默认 CP.
*/
private String relationType;
}

23
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/user/relation/UserCpRelationService.java
View File

@ -1,14 +1,15 @@
package com.red.circle.other.app.service.user.relation;
import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpCabinUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.common.business.dto.cmd.UserIdCmd;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpCabinUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpUserProfileCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyIdQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRelationshipQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.loveletter.SendLoveLetterCmd;
import java.util.List;
@ -22,7 +23,7 @@ public interface UserCpRelationService {
CpUserProfileCO getCpUser(UserIdCmd cmd);
List<CpPairUserProfileCO> getCpPairUserProfileCO(AppExtCommand cmd);
List<CpPairUserProfileCO> getCpPairUserProfileCO(CpRelationshipQueryCmd cmd);
void sendApply(CpApplyCmd cmd);
@ -30,7 +31,7 @@ public interface UserCpRelationService {
void dismissApply(CpApplyDismissCmd cmd);
String getCpApplyId(UserIdCmd cmd);
String getCpApplyId(CpApplyIdQueryCmd cmd);
CpCabinUserProfileCO getCpUserV4(UserIdCommonCmd cmd);

34
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/user/user/UserCpCabinService.java
View File

@ -1,13 +1,15 @@
package com.red.circle.other.app.service.user.user;
import com.red.circle.common.business.dto.cmd.UserIdCommonCmd;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import java.util.List;
import com.red.circle.other.app.dto.clientobject.user.user.CpBlessRecordCO;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpRightsConfigCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinUnreadCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinValueCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRightsConfigQueryCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpBlessRecordQueryCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import java.util.List;
/**
* CP(小屋、祝福)相关
@ -15,11 +17,13 @@ import java.util.List;
*/
public interface UserCpCabinService {
UserCpCabinCO getCpCabinInfo(UserIdCommonCmd cmd);
UserCpCabinValueCO getCpCabinValue(UserIdCommonCmd cmd);
UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserIdCommonCmd cmd);
List<CpBlessRecordCO> pageCpBlessRecord(UserCpBlessRecordQueryCmd cmd);
}
UserCpCabinCO getCpCabinInfo(UserCpCabinQueryCmd cmd);
UserCpCabinValueCO getCpCabinValue(UserCpCabinQueryCmd cmd);
UserCpCabinUnreadCO getCpBlessRecordAndUpRead(UserCpCabinQueryCmd cmd);
List<CpBlessRecordCO> pageCpBlessRecord(UserCpBlessRecordQueryCmd cmd);
CpRightsConfigCO getCpRightsConfig(CpRightsConfigQueryCmd cmd);
}

44
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/cp/impl/CpRelationshipCacheServiceImpl.java vendored
View File

@ -5,11 +5,12 @@ import com.red.circle.component.redis.service.RedisService;
import com.red.circle.other.infra.database.cache.key.user.UserKey;
import com.red.circle.other.infra.database.cache.service.cp.CpRelationshipCacheService;
import com.red.circle.other.infra.database.rds.entity.user.user.BaseInfo;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.BaseInfoService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.inner.model.dto.user.CpSimpleUserProfileCO;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.BaseInfoService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.model.dto.user.CpSimpleUserProfileCO;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.DateUtils;
import lombok.RequiredArgsConstructor;
@ -80,16 +81,17 @@ public class CpRelationshipCacheServiceImpl implements CpRelationshipCacheServic
}
BigDecimal cpValue = cpValueMap.getOrDefault(cpRelationship.getCpValId(), BigDecimal.ZERO);
Long days = DateUtils.toDurationDays(cpRelationship.getCreateTime(), DateUtils.now());
Long days = relationshipDays(cpRelationship.getCreateTime());
String firstDay = cpRelationship.getCreateTime().toInstant()
.atZone(ZoneId.systemDefault()).toLocalDate().toString();
return new CpSimpleUserProfileCO()
.setMeUserId(baseInfo.getId())
.setMeAccount(baseInfo.getAccount())
.setMeUserAvatar(baseInfo.getUserAvatar())
.setMeUserNickname(baseInfo.getUserNickname())
.setCpUserId(cpUser.getId())
.setMeUserId(baseInfo.getId())
.setMeAccount(baseInfo.getAccount())
.setMeUserAvatar(baseInfo.getUserAvatar())
.setMeUserNickname(baseInfo.getUserNickname())
.setRelationType(CpRelationshipType.normalize(cpRelationship.getRelationType()))
.setCpUserId(cpUser.getId())
.setCpAccount(cpUser.getAccount())
.setCpUserAvatar(cpUser.getUserAvatar())
.setCpUserNickname(cpUser.getUserNickname())
@ -113,12 +115,20 @@ public class CpRelationshipCacheServiceImpl implements CpRelationshipCacheServic
return Collections.emptyList();
}
private static String getKey(Long userId) {
return UserKey.CP.getKey(userId);
}
@Override
public void remove(List<Long> userIds) {
private static String getKey(Long userId) {
return UserKey.CP.getKey(userId);
}
private static long relationshipDays(Date createTime) {
Date now = DateUtils.now();
if (!createTime.before(now)) {
return 0L;
}
return DateUtils.toDurationDays(createTime, now);
}
@Override
public void remove(List<Long> userIds) {
userIds.forEach(userId -> {
redisService.delete(getKey(userId));
});

26
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/user/user/CpApply.java
View File

@ -40,16 +40,22 @@ public class CpApply extends TimestampBaseEntity {
@TableField("send_apply_user_id")
private Long sendApplyUserId;
/**
* 接收申请用户.
*/
@TableField("accept_apply_user_id")
private Long acceptApplyUserId;
/**
* 申请消费金币.
*/
@TableField("apply_consume_gold")
/**
* 接收申请用户.
*/
@TableField("accept_apply_user_id")
private Long acceptApplyUserId;
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
@TableField("relation_type")
private String relationType;
/**
* 申请消费金币.
*/
@TableField("apply_consume_gold")
private BigDecimal applyConsumeGold;
/**

18
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/user/user/CpRelationship.java
View File

@ -55,12 +55,18 @@ public class CpRelationship extends TimestampBaseEntity {
/**
* cp用户id.
*/
@TableField("cp_user_id")
private Long cpUserId;
/**
* 0.发起人 1.接收人
*/
@TableField("cp_user_id")
private Long cpUserId;
/**
* 关系类型：CP/BROTHER/SISTERS.
*/
@TableField("relation_type")
private String relationType;
/**
* 0.发起人 1.接收人
*/
@TableField("is_initiate")
private Integer initiate;

43
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/CpApplyService.java
View File

@ -18,11 +18,16 @@ import java.util.List;
*/
public interface CpApplyService extends BaseService<CpApply> {
/**
* 解散cp.
*/
void dismiss(Long requestUserId);
/**
* 解散cp.
*/
void dismiss(Long requestUserId);
/**
* 解散指定类型关系申请.
*/
void dismiss(Long requestUserId, String relationType);
/**
* 获取申请记录.
*
@ -30,7 +35,12 @@ public interface CpApplyService extends BaseService<CpApply> {
* @param sendApplyUserId 发送人
* @return 申请记录ID.
*/
Long getId(Long acceptApplyUserId, Long sendApplyUserId);
Long getId(Long acceptApplyUserId, Long sendApplyUserId);
/**
* 获取指定类型申请记录.
*/
Long getId(Long acceptApplyUserId, Long sendApplyUserId, String relationType);
/**
* 申请记录是否存在.
@ -39,7 +49,12 @@ public interface CpApplyService extends BaseService<CpApply> {
* @param sendApplyUserId 发送人
* @return true　存在，false 不存在
*/
boolean exists(Long acceptApplyUserId, Long sendApplyUserId);
boolean exists(Long acceptApplyUserId, Long sendApplyUserId);
/**
* 指定类型申请记录是否存在.
*/
boolean exists(Long acceptApplyUserId, Long sendApplyUserId, String relationType);
/**
* 是否存在发送记录.
@ -47,7 +62,12 @@ public interface CpApplyService extends BaseService<CpApply> {
* @param sendApplyUserId 发送人
* @return true 存在，false 不存在
*/
boolean existsNotProcessSendApply(Long sendApplyUserId);
boolean existsNotProcessSendApply(Long sendApplyUserId);
/**
* 是否存在指定类型发送记录.
*/
boolean existsNotProcessSendApply(Long sendApplyUserId, String relationType);
/**
* 改变状态同意.
@ -63,7 +83,12 @@ public interface CpApplyService extends BaseService<CpApply> {
*
* @param acceptApplyUserId 接收用户
*/
void refuseStatusWait(Long acceptApplyUserId);
void refuseStatusWait(Long acceptApplyUserId);
/**
* 拒绝指定类型所有等待状态.
*/
void refuseStatusWait(Long acceptApplyUserId, String relationType);
/**
* 获取我拒绝都信息.

80
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/CpRelationshipService.java
View File

@ -26,16 +26,26 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
*/
List<CpRelationship> listLatestCp(String sysOrigin, Set<Long> excludeUserId, Integer size);
/**
* 是否互为cp.
*/
boolean existsCp(Long userId, Long cpUserId);
/**
* 是否互为cp.
*/
boolean existsCp(Long userId, Long cpUserId);
/**
* 是否存在指定类型关系.
*/
boolean existsCp(Long userId, Long cpUserId, String relationType);
/**
* 获取分手中的cp信息集合
*/
List<CpRelationship> getDismissingByUserId(Long userId);
List<CpRelationship> getDismissingByUserId(Long userId);
/**
* 获取指定类型分手中的cp信息集合.
*/
List<CpRelationship> getDismissingByUserId(Long userId, String relationType);
/**
* 获取cp用户id.
*
@ -47,13 +57,23 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
/**
* 获取cp信息集合
*/
List<CpRelationship> getByUserId(Long userId);
List<CpRelationship> getByUserId(Long userId);
/**
* 获取指定类型cp信息集合.
*/
List<CpRelationship> getByUserId(Long userId, String relationType);
/**
* 获取cp信息.
*/
CpRelationship getByUserId(Long userId, Long cpUserId);
CpRelationship getByUserId(Long userId, Long cpUserId);
/**
* 获取指定类型cp信息.
*/
CpRelationship getByUserId(Long userId, Long cpUserId, String relationType);
/**
* 获取cpValId
*
@ -75,7 +95,13 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
* @param bindCpValId cp值id
* @param sysOrigin 系统
*/
void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId, String sysOrigin);
void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId, String sysOrigin);
/**
* 组建指定类型关系.
*/
void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId, String sysOrigin,
String relationType);
/**
* 获取cp信息.
@ -90,7 +116,12 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
* @param userId 用户id
* @return
*/
CpRelationship getByUserIdOrCpUserId(Long userId);
CpRelationship getByUserIdOrCpUserId(Long userId);
/**
* 按关系类型获取任一用户关联关系.
*/
CpRelationship getByUserIdOrCpUserId(Long userId, String relationType);
/**
* 获取用户正常CP数量.
@ -107,14 +138,24 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
* @param cpUserId cp用户id
* @return CP关系
*/
CpRelationship getDismissingCp(Long userId, Long cpUserId);
CpRelationship getDismissingCp(Long userId, Long cpUserId);
/**
* 获取指定类型分手中的关系.
*/
CpRelationship getDismissingCp(Long userId, Long cpUserId, String relationType);
/**
* 更新CP关系为分手中.
*
* @param userId 用户id
*/
void updateToDismissing(Long userId, Long cpUserId);
void updateToDismissing(Long userId, Long cpUserId);
/**
* 更新指定类型关系为分手中.
*/
void updateToDismissing(Long userId, Long cpUserId, String relationType);
/**
* 复合CP（更新为正常状态）.
@ -122,7 +163,12 @@ public interface CpRelationshipService extends BaseService<CpRelationship> {
* @param userId 用户id
* @param cpUserId cp用户id
*/
void reconcile(Long userId, Long cpUserId);
void reconcile(Long userId, Long cpUserId);
/**
* 复合指定类型关系.
*/
void reconcile(Long userId, Long cpUserId, String relationType);
/**
* 获取7天前分手中的CP关系列表.

106
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/impl/CpApplyServiceImpl.java
View File

@ -6,9 +6,10 @@ import com.red.circle.framework.mybatis.constant.PageConstant;
import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl;
import com.red.circle.tool.core.text.StringUtils;
import com.red.circle.other.infra.database.rds.dao.user.user.CpApplyDAO;
import com.red.circle.other.infra.database.rds.entity.user.user.CpApply;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.other.infra.database.rds.entity.user.user.CpApply;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.enums.user.user.CpApplyStatus;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import com.red.circle.other.inner.model.cmd.user.CpApplyQryCmd;
import java.time.LocalDateTime;
import java.util.List;
@ -28,44 +29,67 @@ import org.springframework.stereotype.Service;
public class CpApplyServiceImpl extends BaseServiceImpl<CpApplyDAO, CpApply> implements
CpApplyService {
@Override
public void dismiss(Long requestUserId) {
update()
.set(CpApply::getStatus, CpApplyStatus.DISMISS)
.set(CpApply::getUpdateTime, LocalDateTime.now())
.set(CpApply::getUpdateUser, requestUserId)
.eq(CpApply::getStatus, CpApplyStatus.AGREE)
.and(where -> where.eq(CpApply::getSendApplyUserId, requestUserId)
@Override
public void dismiss(Long requestUserId) {
dismiss(requestUserId, CpRelationshipType.CP.name());
}
@Override
public void dismiss(Long requestUserId, String relationType) {
update()
.set(CpApply::getStatus, CpApplyStatus.DISMISS)
.set(CpApply::getUpdateTime, LocalDateTime.now())
.set(CpApply::getUpdateUser, requestUserId)
.eq(CpApply::getRelationType, CpRelationshipType.normalize(relationType))
.eq(CpApply::getStatus, CpApplyStatus.AGREE)
.and(where -> where.eq(CpApply::getSendApplyUserId, requestUserId)
.or().eq(CpApply::getAcceptApplyUserId, requestUserId))
.last(PageConstant.LIMIT_ONE)
.execute();
}
@Override
public Long getId(Long acceptApplyUserId, Long sendApplyUserId) {
return Optional.ofNullable(
query()
.select(CpApply::getId)
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.eq(CpApply::getAcceptApplyUserId, acceptApplyUserId)
.eq(CpApply::getSendApplyUserId, sendApplyUserId)
@Override
public Long getId(Long acceptApplyUserId, Long sendApplyUserId) {
return getId(acceptApplyUserId, sendApplyUserId, CpRelationshipType.CP.name());
}
@Override
public Long getId(Long acceptApplyUserId, Long sendApplyUserId, String relationType) {
return Optional.ofNullable(
query()
.select(CpApply::getId)
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.eq(CpApply::getRelationType, CpRelationshipType.normalize(relationType))
.eq(CpApply::getAcceptApplyUserId, acceptApplyUserId)
.eq(CpApply::getSendApplyUserId, sendApplyUserId)
.last(PageConstant.LIMIT_ONE)
.getOne()
).map(CpApply::getId).orElse(null);
}
@Override
public boolean exists(Long acceptApplyUserId, Long sendApplyUserId) {
return Optional.ofNullable(getId(acceptApplyUserId, sendApplyUserId)).isPresent();
}
@Override
public boolean existsNotProcessSendApply(Long sendApplyUserId) {
return Optional.ofNullable(query()
.select(CpApply::getId)
.eq(CpApply::getSendApplyUserId, sendApplyUserId)
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.getOne())
@Override
public boolean exists(Long acceptApplyUserId, Long sendApplyUserId) {
return exists(acceptApplyUserId, sendApplyUserId, CpRelationshipType.CP.name());
}
@Override
public boolean exists(Long acceptApplyUserId, Long sendApplyUserId, String relationType) {
return Optional.ofNullable(getId(acceptApplyUserId, sendApplyUserId, relationType)).isPresent();
}
@Override
public boolean existsNotProcessSendApply(Long sendApplyUserId) {
return existsNotProcessSendApply(sendApplyUserId, CpRelationshipType.CP.name());
}
@Override
public boolean existsNotProcessSendApply(Long sendApplyUserId, String relationType) {
return Optional.ofNullable(query()
.select(CpApply::getId)
.eq(CpApply::getSendApplyUserId, sendApplyUserId)
.eq(CpApply::getRelationType, CpRelationshipType.normalize(relationType))
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.getOne())
.map(cpApply -> Objects.nonNull(cpApply.getId()))
.orElse(Boolean.FALSE);
}
@ -78,13 +102,19 @@ public class CpApplyServiceImpl extends BaseServiceImpl<CpApplyDAO, CpApply> imp
.execute();
}
@Override
public void refuseStatusWait(Long acceptApplyUserId) {
update()
.set(CpApply::getStatus, CpApplyStatus.REFUSE)
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.eq(CpApply::getAcceptApplyUserId, acceptApplyUserId)
.execute();
@Override
public void refuseStatusWait(Long acceptApplyUserId) {
refuseStatusWait(acceptApplyUserId, CpRelationshipType.CP.name());
}
@Override
public void refuseStatusWait(Long acceptApplyUserId, String relationType) {
update()
.set(CpApply::getStatus, CpApplyStatus.REFUSE)
.eq(CpApply::getStatus, CpApplyStatus.WAIT)
.eq(CpApply::getRelationType, CpRelationshipType.normalize(relationType))
.eq(CpApply::getAcceptApplyUserId, acceptApplyUserId)
.execute();
}
@Override

241
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/user/user/impl/CpRelationshipServiceImpl.java
View File

@ -7,9 +7,10 @@ import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.date.LocalDateUtils;
import com.red.circle.other.infra.database.rds.dao.user.user.CpRelationshipDAO;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipStatus;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.enums.user.user.CpRelationshipStatus;
import com.red.circle.other.infra.enums.user.user.CpRelationshipType;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
@ -45,14 +46,20 @@ public class CpRelationshipServiceImpl extends
}
@Override
public boolean existsCp(Long userId, Long cpUserId) {
return Optional.ofNullable(
query().select(CpRelationship::getId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
@Override
public boolean existsCp(Long userId, Long cpUserId) {
return existsCp(userId, cpUserId, CpRelationshipType.CP.name());
}
@Override
public boolean existsCp(Long userId, Long cpUserId, String relationType) {
return Optional.ofNullable(
query().select(CpRelationship::getId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))
)
.last(PageConstant.LIMIT_ONE)
@ -60,41 +67,61 @@ public class CpRelationshipServiceImpl extends
).map(cpRelationship -> Objects.nonNull(cpRelationship.getId())).orElse(Boolean.FALSE);
}
@Override
public List<CpRelationship> getDismissingByUserId(Long userId) {
return query()
.eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.list();
}
@Override
public List<CpRelationship> getDismissingByUserId(Long userId) {
return getDismissingByUserId(userId, CpRelationshipType.CP.name());
}
@Override
public List<CpRelationship> getDismissingByUserId(Long userId, String relationType) {
return query()
.eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.list();
}
@Override
public List<Long> getCpUserId(Long userId) {
return query().select(CpRelationship::getCpUserId, TimestampBaseEntity::getCreateTime)
.eq(CpRelationship::getUserId, userId)
.list()
@Override
public List<Long> getCpUserId(Long userId) {
return query().select(CpRelationship::getCpUserId, TimestampBaseEntity::getCreateTime)
.eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getRelationType, CpRelationshipType.CP.name())
.list()
.stream()
.sorted(Comparator.comparing(CpRelationship::getCreateTime).reversed())
.map(CpRelationship::getCpUserId)
.toList();
}
@Override
public List<CpRelationship> getByUserId(Long userId) {
return query()
.eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.orderByAsc(TimestampBaseEntity::getCreateTime)
.list();
}
@Override
public CpRelationship getByUserId(Long userId, Long cpUserId) {
return query()
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
@Override
public List<CpRelationship> getByUserId(Long userId) {
return getByUserId(userId, CpRelationshipType.CP.name());
}
@Override
public List<CpRelationship> getByUserId(Long userId, String relationType) {
return query()
.eq(CpRelationship::getUserId, userId)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.eq(Objects.nonNull(relationType), CpRelationship::getRelationType,
Objects.nonNull(relationType) ? CpRelationshipType.normalize(relationType) : null)
.orderByAsc(TimestampBaseEntity::getCreateTime)
.list();
}
@Override
public CpRelationship getByUserId(Long userId, Long cpUserId) {
return getByUserId(userId, cpUserId, CpRelationshipType.CP.name());
}
@Override
public CpRelationship getByUserId(Long userId, Long cpUserId, String relationType) {
return query()
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))
)
.last(PageConstant.LIMIT_ONE)
@ -116,15 +143,21 @@ public class CpRelationshipServiceImpl extends
removeById(id);
}
@Override
public void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId,
String sysOrigin) {
CpRelationship sendUser = createCpRelationshipBean(sendApplyUserId, acceptApplyUserId,
bindCpValId, 0, sysOrigin);
CpRelationship cpUser = createCpRelationshipBean(acceptApplyUserId, sendApplyUserId,
bindCpValId, 1, sysOrigin);
saveBatch(Arrays.asList(sendUser, cpUser));
}
@Override
public void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId,
String sysOrigin) {
addCp(sendApplyUserId, acceptApplyUserId, bindCpValId, sysOrigin, CpRelationshipType.CP.name());
}
@Override
public void addCp(Long sendApplyUserId, Long acceptApplyUserId, Long bindCpValId,
String sysOrigin, String relationType) {
CpRelationship sendUser = createCpRelationshipBean(sendApplyUserId, acceptApplyUserId,
bindCpValId, 0, sysOrigin, relationType);
CpRelationship cpUser = createCpRelationshipBean(acceptApplyUserId, sendApplyUserId,
bindCpValId, 1, sysOrigin, relationType);
saveBatch(Arrays.asList(sendUser, cpUser));
}
@Override
public void updateAccountByUserId(Long userId, BigDecimal account) {
@ -134,24 +167,32 @@ public class CpRelationshipServiceImpl extends
}
@Override
public CpRelationship getByUserIdOrCpUserId(Long userId) {
return Optional.ofNullable(query()
.and(where -> where.eq(CpRelationship::getUserId, userId)
.or().eq(CpRelationship::getCpUserId, userId))
.last(PageConstant.LIMIT_ONE)
@Override
public CpRelationship getByUserIdOrCpUserId(Long userId) {
return getByUserIdOrCpUserId(userId, CpRelationshipType.CP.name());
}
@Override
public CpRelationship getByUserIdOrCpUserId(Long userId, String relationType) {
return Optional.ofNullable(query()
.eq(Objects.nonNull(relationType), CpRelationship::getRelationType,
Objects.nonNull(relationType) ? CpRelationshipType.normalize(relationType) : null)
.and(where -> where.eq(CpRelationship::getUserId, userId)
.or().eq(CpRelationship::getCpUserId, userId))
.last(PageConstant.LIMIT_ONE)
.getOne()
).orElse(null);
}
private CpRelationship createCpRelationshipBean(Long userId, Long cpUserId, Long bindCpValId,
Integer initiate, String sysOrigin) {
CpRelationship cpUser = new CpRelationship()
.setUserId(userId)
.setCpUserId(cpUserId)
.setCpValId(bindCpValId)
.setInitiate(initiate)
.setSysOrigin(sysOrigin)
private CpRelationship createCpRelationshipBean(Long userId, Long cpUserId, Long bindCpValId,
Integer initiate, String sysOrigin, String relationType) {
CpRelationship cpUser = new CpRelationship()
.setUserId(userId)
.setCpUserId(cpUserId)
.setCpValId(bindCpValId)
.setRelationType(CpRelationshipType.normalize(relationType))
.setInitiate(initiate)
.setSysOrigin(sysOrigin)
.setAmount(BigDecimal.ZERO)
.setStatus(CpRelationshipStatus.NORMAL.name())
.setDismissTime(null);
@ -167,41 +208,59 @@ public class CpRelationshipServiceImpl extends
.count());
}
@Override
public CpRelationship getDismissingCp(Long userId, Long cpUserId) {
return query()
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))
)
.eq(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.last(PageConstant.LIMIT_ONE)
.getOne();
}
@Override
public void updateToDismissing(Long userId, Long cpUserId) {
update()
.set(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.set(CpRelationship::getDismissTime, TimestampUtils.now().getTime())
.set(CpRelationship::getUpdateTime, TimestampUtils.now())
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
@Override
public CpRelationship getDismissingCp(Long userId, Long cpUserId) {
return getDismissingCp(userId, cpUserId, CpRelationshipType.CP.name());
}
@Override
public CpRelationship getDismissingCp(Long userId, Long cpUserId, String relationType) {
return query()
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))
)
.eq(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.last(PageConstant.LIMIT_ONE)
.getOne();
}
@Override
public void updateToDismissing(Long userId, Long cpUserId) {
updateToDismissing(userId, cpUserId, CpRelationshipType.CP.name());
}
@Override
public void updateToDismissing(Long userId, Long cpUserId, String relationType) {
update()
.set(CpRelationship::getStatus, CpRelationshipStatus.DISMISSING.name())
.set(CpRelationship::getDismissTime, TimestampUtils.now().getTime())
.set(CpRelationship::getUpdateTime, TimestampUtils.now())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))
)
.eq(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.execute();
}
@Override
public void reconcile(Long userId, Long cpUserId) {
update()
.set(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.set(CpRelationship::getDismissTime, null)
.set(CpRelationship::getUpdateTime, TimestampUtils.now())
.and(where -> where
@Override
public void reconcile(Long userId, Long cpUserId) {
reconcile(userId, cpUserId, CpRelationshipType.CP.name());
}
@Override
public void reconcile(Long userId, Long cpUserId, String relationType) {
update()
.set(CpRelationship::getStatus, CpRelationshipStatus.NORMAL.name())
.set(CpRelationship::getDismissTime, null)
.set(CpRelationship::getUpdateTime, TimestampUtils.now())
.eq(CpRelationship::getRelationType, CpRelationshipType.normalize(relationType))
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, userId).eq(CpRelationship::getCpUserId, cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, cpUserId).eq(CpRelationship::getCpUserId, userId))

63
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/enums/user/user/CpRelationshipType.java Normal file
View File

@ -0,0 +1,63 @@
package com.red.circle.other.infra.enums.user.user;
import java.util.Locale;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
/**
* CP family relationship type.
*/
public enum CpRelationshipType {
/**
* Couple, requires different genders.
*/
CP,
/**
* Brothers, requires both users to be male.
*/
BROTHER,
/**
* Sisters, requires both users to be female.
*/
SISTERS;
private static final int FEMALE = 0;
private static final int MALE = 1;
public static CpRelationshipType of(String value) {
if (StringUtils.isBlank(value)) {
return CP;
}
String normalized = value.trim().toUpperCase(Locale.ROOT);
if (Objects.equals(normalized, "BROTHERS")) {
return BROTHER;
}
if (Objects.equals(normalized, "SISTER")) {
return SISTERS;
}
return CpRelationshipType.valueOf(normalized);
}
public static String normalize(String value) {
return of(value).name();
}
public boolean genderMatched(Integer sendUserSex, Integer acceptUserSex) {
return switch (this) {
case CP -> !Objects.equals(sendUserSex, acceptUserSex);
case BROTHER -> Objects.equals(sendUserSex, MALE) && Objects.equals(acceptUserSex, MALE);
case SISTERS -> Objects.equals(sendUserSex, FEMALE) && Objects.equals(acceptUserSex, FEMALE);
};
}
public String applyTargetText() {
return switch (this) {
case CP -> "a couple";
case BROTHER -> "brothers";
case SISTERS -> "sisters";
};
}
}

14
rc-service/rc-service-other/other-infrastructure/src/main/resources/dao/user/user/CpRelationshipDAO.xml
View File

@ -9,10 +9,11 @@
FROM `user_cp_relationship`
WHERE `cp_val_id` IN (SELECT vId
FROM (SELECT DISTINCT(`cp_val_id`) vId
FROM `user_cp_relationship`
WHERE `sys_origin` = #{sysOrigin}
ORDER BY id DESC
LIMIT #{size}) tmp)
FROM `user_cp_relationship`
WHERE `sys_origin` = #{sysOrigin}
AND `relation_type` = 'CP'
ORDER BY id DESC
LIMIT #{size}) tmp)
</select>
<select id="listLatestCpExcludeUserId"
@ -23,8 +24,9 @@
SELECT vId
FROM(
SELECT DISTINCT(`cp_val_id`) vId
FROM `user_cp_relationship`
WHERE `sys_origin`= #{sysOrigin}
FROM `user_cp_relationship`
WHERE `sys_origin`= #{sysOrigin}
AND `relation_type` = 'CP'
<if test="excludeUserId != null and excludeUserId.size() > 0">
AND user_id NOT IN
<foreach item="item" collection="excludeUserId" open="(" separator="," close=")">

38
rc-service/rc-service-other/other-start/pom.xml
View File

@ -18,13 +18,24 @@
<groupId>com.red.circle</groupId>
<artifactId>other-inner-endpoint</artifactId>
</dependency>
<dependency>
<groupId>com.red.circle</groupId>
<artifactId>component-redis</artifactId>
</dependency>
<!-- Apache POI for Excel processing -->
<dependency>
<dependency>
<groupId>com.red.circle</groupId>
<artifactId>component-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<!-- Apache POI for Excel processing -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.3</version>
@ -36,10 +47,15 @@
</dependency>
</dependencies>
<build>
<finalName>${parent.artifactId}-${revision}</finalName>
<plugins>
<plugin>
<build>
<finalName>${parent.artifactId}-${revision}</finalName>
<testResources combine.self="override">
<testResource>
<directory>src/test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>spring-boot-maven-plugin</artifactId>
<groupId>org.springframework.boot</groupId>
<executions>

441
rc-service/rc-service-other/other-start/src/test/java/CpLocalFlowSmokeTest.java Normal file
View File

@ -0,0 +1,441 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.collect.Lists;
import com.red.circle.OtherServiceApplication;
import com.red.circle.framework.core.dto.ReqSysOrigin;
import com.red.circle.other.app.command.user.DismissCpApplyCmdExe;
import com.red.circle.other.app.command.user.ProcessCpApplyCmd;
import com.red.circle.other.app.command.user.SendCpApplyCmdExe;
import com.red.circle.other.app.command.user.query.UserCpPairUserProfileQryExe;
import com.red.circle.other.app.command.user.query.UserCpCabinQueryExe;
import com.red.circle.other.app.dto.clientobject.user.relation.cp.CpPairUserProfileCO;
import com.red.circle.other.app.dto.clientobject.user.user.UserCpCabinCO;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpApplyDismissCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.CpRelationshipQueryCmd;
import com.red.circle.other.app.dto.cmd.user.relation.cp.ProcessApplyCmd;
import com.red.circle.other.app.dto.cmd.user.user.UserCpCabinQueryCmd;
import com.red.circle.other.domain.gateway.user.ability.UserRegionGateway;
import com.red.circle.other.infra.database.cache.service.other.GiftCacheService;
import com.red.circle.other.infra.database.mongo.entity.gift.GiftAcceptUser;
import com.red.circle.other.infra.database.mongo.entity.gift.GiftGiveRunningWater;
import com.red.circle.other.infra.database.mongo.entity.gift.GiftValue;
import com.red.circle.other.infra.database.rds.entity.user.user.BaseInfo;
import com.red.circle.other.infra.database.rds.entity.user.user.CpApply;
import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord;
import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship;
import com.red.circle.other.infra.database.rds.service.user.user.BaseInfoService;
import com.red.circle.other.infra.database.rds.service.user.user.CpApplyService;
import com.red.circle.other.infra.database.rds.service.user.user.CpBlessRecordService;
import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
import com.red.circle.other.infra.database.rds.service.user.user.CpValueService;
import com.red.circle.other.inner.enums.material.GiftCurrencyType;
import com.red.circle.other.inner.model.dto.material.GiftConfigDTO;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.annotation.IfProfileValue;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.util.AopTestUtils;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.test.web.servlet.MockMvc;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@RunWith(SpringRunner.class)
@IfProfileValue(name = "cp.local.flow", value = "true")
@AutoConfigureMockMvc
@SpringBootTest(classes = OtherServiceApplication.class)
public class CpLocalFlowSmokeTest {
private static final String SYS_ORIGIN = "LIKEI";
private static final ReqSysOrigin REQ_SYS_ORIGIN = ReqSysOrigin.of(SYS_ORIGIN, SYS_ORIGIN);
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
private MockMvc mockMvc;
@Autowired
private BaseInfoService baseInfoService;
@Autowired
private UserRegionGateway userRegionGateway;
@Autowired
private SendCpApplyCmdExe sendCpApplyCmdExe;
@Autowired
private ProcessCpApplyCmd processCpApplyCmd;
@Autowired
private DismissCpApplyCmdExe dismissCpApplyCmdExe;
@Autowired
private UserCpPairUserProfileQryExe pairUserProfileQryExe;
@Autowired
private UserCpCabinQueryExe userCpCabinQueryExe;
@Autowired
private CpApplyService cpApplyService;
@Autowired
private CpRelationshipService cpRelationshipService;
@Autowired
private CpValueService cpValueService;
@Autowired
private CpBlessRecordService cpBlessRecordService;
@Autowired
private GiftCacheService giftCacheService;
private final List<Long> createdApplyIds = new ArrayList<>();
private final List<Long> createdCpValIds = new ArrayList<>();
private final List<RelationPair> createdPairs = new ArrayList<>();
@Before
public void ensureSchema() {
executeIgnoreDuplicate(
"ALTER TABLE `user_cp_apply` ADD COLUMN `relation_type` varchar(32) NOT NULL DEFAULT 'CP' "
+ "COMMENT '关系类型：CP/BROTHER/SISTERS' AFTER `accept_apply_user_id`");
executeIgnoreDuplicate(
"ALTER TABLE `user_cp_relationship` ADD COLUMN `relation_type` varchar(32) NOT NULL DEFAULT 'CP' "
+ "COMMENT '关系类型：CP/BROTHER/SISTERS' AFTER `cp_user_id`");
jdbcTemplate.update("UPDATE `user_cp_apply` SET `relation_type` = 'CP' "
+ "WHERE `relation_type` IS NULL OR `relation_type` = ''");
jdbcTemplate.update("UPDATE `user_cp_relationship` SET `relation_type` = 'CP' "
+ "WHERE `relation_type` IS NULL OR `relation_type` = ''");
}
@After
public void cleanup() {
for (RelationPair pair : createdPairs) {
cpRelationshipService.remove(new LambdaQueryWrapper<CpRelationship>()
.eq(CpRelationship::getRelationType, pair.relationType)
.and(where -> where
.nested(w -> w.eq(CpRelationship::getUserId, pair.userId)
.eq(CpRelationship::getCpUserId, pair.cpUserId))
.or()
.nested(w -> w.eq(CpRelationship::getUserId, pair.cpUserId)
.eq(CpRelationship::getCpUserId, pair.userId))));
}
for (Long cpValId : createdCpValIds) {
cpBlessRecordService.deleteByCpValId(cpValId);
cpValueService.deleteById(cpValId);
}
if (!createdApplyIds.isEmpty()) {
cpApplyService.removeByIds(createdApplyIds);
}
}
@Test
public void walkThroughCpBrotherAndSistersFlowsWithLocalData() throws Exception {
List<BaseInfo> candidates = baseInfoService.query()
.select(BaseInfo::getId, BaseInfo::getUserSex, BaseInfo::getOriginSys,
BaseInfo::getAccount, BaseInfo::getUserNickname, BaseInfo::getCountryCode)
.eq(BaseInfo::getOriginSys, SYS_ORIGIN)
.in(BaseInfo::getUserSex, Arrays.asList(0, 1))
.orderByDesc(BaseInfo::getId)
.last("LIMIT 500")
.list();
assertFalse("local LIKEI candidates should not be empty", candidates.isEmpty());
UserPair cpPair = findPair(candidates, 1, 0, "CP");
runCpGiftApplyBlessDismissFlow(cpPair);
UserPair brotherPair = findPair(candidates, 1, 1, "BROTHER");
runNoChargeApplyAndAgreeFlow(brotherPair, "BROTHER");
UserPair sistersPair = findPair(candidates, 0, 0, "SISTERS");
runNoChargeApplyAndAgreeFlow(sistersPair, "SISTERS");
}
@Test
public void cpCabinReturnsEmptyStateWhenUserHasNoRelationship() throws Exception {
Long queryUserId = 2042274349343506434L;
Long reqUserId = 4569421795454615555L;
assertCpCabinEmptyState(queryUserId, reqUserId, "CP");
assertCpCabinEmptyState(queryUserId, reqUserId, "BROTHER");
assertCpCabinEmptyState(queryUserId, reqUserId, "SISTERS");
assertCpCabinRestEmptyState(queryUserId, reqUserId, "CP");
assertCpCabinRestEmptyState(queryUserId, reqUserId, "BROTHER");
assertCpCabinRestEmptyState(queryUserId, reqUserId, "SISTERS");
assertCpRightsRestConfig(queryUserId, "CP");
assertCpRightsRestConfig(queryUserId, "BROTHER");
assertCpRightsRestConfig(queryUserId, "SISTERS");
}
@Test
public void cpGiftAutoApplySkipsWhenRulesDoNotMatch() {
List<BaseInfo> candidates = baseInfoService.query()
.select(BaseInfo::getId, BaseInfo::getUserSex, BaseInfo::getOriginSys)
.eq(BaseInfo::getOriginSys, SYS_ORIGIN)
.eq(BaseInfo::getUserSex, 1)
.orderByDesc(BaseInfo::getId)
.last("LIMIT 500")
.list();
assertFalse("local LIKEI male candidates should not be empty", candidates.isEmpty());
UserPair sameGenderPair = findPair(candidates, 1, 1, "CP");
boolean created = sendCpApplyCmdExe.autoCreateFromCpGift(sameGenderPair.sendUserId,
sameGenderPair.acceptUserId, SYS_ORIGIN);
assertFalse("CP gift auto apply should skip same gender users", created);
assertNull("CP gift auto apply should not create WAIT apply when skipped",
cpApplyService.getId(sameGenderPair.acceptUserId, sameGenderPair.sendUserId, "CP"));
}
private void runCpGiftApplyBlessDismissFlow(UserPair pair) throws Exception {
boolean created = sendCpApplyCmdExe.autoCreateFromCpGift(pair.sendUserId, pair.acceptUserId,
SYS_ORIGIN);
Long pendingApplyId = cpApplyService.getId(pair.acceptUserId, pair.sendUserId, "CP");
if (pendingApplyId != null && !createdApplyIds.contains(pendingApplyId)) {
createdApplyIds.add(pendingApplyId);
}
assertTrue("CP gift should auto create CP apply", created);
Long applyId = pendingApplyId;
assertNotNull("CP auto apply id", applyId);
createdApplyIds.add(applyId);
CpApply apply = cpApplyService.getById(applyId);
assertEquals("CP", apply.getRelationType());
assertEquals(0, BigDecimal.ZERO.compareTo(apply.getApplyConsumeGold()));
agree(applyId, pair.acceptUserId);
CpRelationship relationship = cpRelationshipService.getByUserId(pair.sendUserId,
pair.acceptUserId, "CP");
assertNotNull("CP relationship", relationship);
createdPairs.add(new RelationPair(pair.sendUserId, pair.acceptUserId, "CP"));
createdCpValIds.add(relationship.getCpValId());
sendBlessGift(relationship, pair);
List<CpBlessRecord> blessRecords = cpBlessRecordService.query()
.eq(CpBlessRecord::getCpValId, relationship.getCpValId())
.list();
assertEquals("bless records for both users", 2, blessRecords.size());
CpApplyDismissCmd dismissCmd = new CpApplyDismissCmd()
.setCpUserId(pair.acceptUserId)
.setRelationType("CP");
dismissCmd.setReqUserId(pair.sendUserId);
dismissCmd.setReqSysOrigin(REQ_SYS_ORIGIN);
dismissCpApplyCmdExe.execute(dismissCmd);
CpPairUserProfileCO dismissing = findPairView(pair.sendUserId, pair.acceptUserId, "CP");
assertNotNull("CP pair after dismiss", dismissing);
assertEquals("DISMISSING", dismissing.getStatus());
assertNotNull("dismissEndTime", dismissing.getDismissEndTime());
assertNotNull("dismissRemainSeconds", dismissing.getDismissRemainSeconds());
assertTrue("dismissRemainSeconds should be positive",
dismissing.getDismissRemainSeconds() > 0);
}
private void assertCpCabinEmptyState(Long queryUserId, Long reqUserId, String relationType) {
UserCpCabinQueryCmd cmd = new UserCpCabinQueryCmd();
cmd.setUserId(queryUserId);
cmd.setReqUserId(reqUserId);
cmd.setReqSysOrigin(REQ_SYS_ORIGIN);
cmd.setRelationType(relationType);
UserCpCabinCO cabin = userCpCabinQueryExe.execute(cmd);
assertNotNull(relationType + " empty cabin", cabin);
assertEquals("0", cabin.getCpVal());
assertEquals(Long.valueOf(0L), cabin.getBlessVal());
assertNull(cabin.getCpPairUserProfileCO());
assertNotNull(cabin.getCpCabinConfigCO());
assertTrue(cabin.getCpCabinConfigCO().isEmpty());
assertNull(cabin.getCurrentCpCabinConfigCO());
assertNull(cabin.getUserCpCabinSpecial());
assertFalse(cabin.getCheckSelfCabin());
}
private void assertCpCabinRestEmptyState(Long queryUserId, Long reqUserId,
String relationType) throws Exception {
mockMvc.perform(get("/user/cp/cabin")
.param("userId", String.valueOf(queryUserId))
.param("relationType", relationType)
.header("Req-Sys-Origin", "origin=LIKEI;originChild=LIKEI;")
.header("Req-App-Intel", "version=1.0.0;build=1;channel=local;")
.header("Req-Client", "Android")
.header("Req-Inner-Internal",
"time=" + System.currentTimeMillis() + ";uid=" + reqUserId + ";"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.status").value(true))
.andExpect(jsonPath("$.body.cpVal").value("0"))
.andExpect(jsonPath("$.body.blessVal").value("0"))
.andExpect(jsonPath("$.body.cpPairUserProfileCO").doesNotExist())
.andExpect(jsonPath("$.body.cpCabinConfigCO").isArray())
.andExpect(jsonPath("$.body.cpCabinConfigCO").isEmpty())
.andExpect(jsonPath("$.body.currentCpCabinConfigCO").doesNotExist())
.andExpect(jsonPath("$.body.userCpCabinSpecial").doesNotExist())
.andExpect(jsonPath("$.body.checkSelfCabin").value(false));
}
private void assertCpRightsRestConfig(Long reqUserId, String relationType) throws Exception {
mockMvc.perform(get("/user/cp/rights/config")
.param("relationType", relationType)
.header("Req-Sys-Origin", "origin=LIKEI;originChild=LIKEI;")
.header("Req-App-Intel", "version=1.0.0;build=1;channel=local;")
.header("Req-Client", "Android")
.header("Req-Inner-Internal",
"time=" + System.currentTimeMillis() + ";uid=" + reqUserId + ";"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.status").value(true))
.andExpect(jsonPath("$.body.relationType").value(relationType))
.andExpect(jsonPath("$.body.relationshipStatus").exists())
.andExpect(jsonPath("$.body.intimacyValue").exists())
.andExpect(jsonPath("$.body.levels").isArray());
}
private void runNoChargeApplyAndAgreeFlow(UserPair pair, String relationType) throws Exception {
Method process = SendCpApplyCmdExe.class.getDeclaredMethod("process", Long.class, Long.class,
String.class, String.class, boolean.class);
process.setAccessible(true);
process.invoke(sendCpApplyCmdExe, pair.sendUserId, pair.acceptUserId, SYS_ORIGIN, relationType,
false);
Long applyId = cpApplyService.getId(pair.acceptUserId, pair.sendUserId, relationType);
assertNotNull(relationType + " apply id", applyId);
createdApplyIds.add(applyId);
CpApply apply = cpApplyService.getById(applyId);
assertEquals(relationType, apply.getRelationType());
assertEquals(0, BigDecimal.ZERO.compareTo(apply.getApplyConsumeGold()));
agree(applyId, pair.acceptUserId);
CpRelationship relationship = cpRelationshipService.getByUserId(pair.sendUserId,
pair.acceptUserId, relationType);
assertNotNull(relationType + " relationship", relationship);
assertEquals(relationType, relationship.getRelationType());
createdPairs.add(new RelationPair(pair.sendUserId, pair.acceptUserId, relationType));
createdCpValIds.add(relationship.getCpValId());
CpPairUserProfileCO pairView = findPairView(pair.sendUserId, pair.acceptUserId, relationType);
assertNotNull(relationType + " pair view", pairView);
assertEquals(relationType, pairView.getRelationType());
assertEquals("NORMAL", pairView.getStatus());
assertNull(pairView.getDismissEndTime());
}
private void agree(Long applyId, Long acceptUserId) {
ProcessApplyCmd cmd = new ProcessApplyCmd()
.setApplyId(applyId)
.setAgree(Boolean.TRUE);
cmd.setReqUserId(acceptUserId);
cmd.setReqSysOrigin(REQ_SYS_ORIGIN);
processCpApplyCmd.execute(cmd);
}
private void sendBlessGift(CpRelationship relationship, UserPair pair) throws Exception {
GiftConfigDTO gift = giftCacheService.listBySysOrigin(
com.red.circle.common.business.core.enums.SysOriginPlatformEnum.LIKEI)
.stream()
.filter(g -> Objects.nonNull(g.getGiftPhoto()))
.findFirst()
.orElse(null);
assertNotNull("local gift config", gift);
GiftGiveRunningWater runningWater = GiftGiveRunningWater.builder()
.id(System.currentTimeMillis())
.sysOrigin(SYS_ORIGIN)
.originId("cp-local-flow")
.dynamicContentId(null)
.userId(pair.sendUserId)
.giftId(gift.getId())
.checkBlessingsGift(Boolean.TRUE)
.acceptUsers(Lists.newArrayList(GiftAcceptUser.builder()
.acceptUserId(pair.acceptUserId)
.build()))
.giftValue(GiftValue.builder()
.currencyType(GiftCurrencyType.GOLD.name())
.giftType("CP")
.unitPrice(BigDecimal.ONE)
.quantity(1)
.userSize(1)
.giftValue(BigDecimal.ONE)
.actualAmount(BigDecimal.ONE)
.build())
.build();
Object target = AopTestUtils.getUltimateTargetObject(giftCountStrategy);
ReflectionTestUtils.invokeMethod(target, "saveBlessingsRecord", runningWater);
}
@Autowired
private com.red.circle.other.app.listener.gift.strategy.GiftCountStrategy giftCountStrategy;
private CpPairUserProfileCO findPairView(Long userId, Long cpUserId, String relationType) {
CpRelationshipQueryCmd cmd = new CpRelationshipQueryCmd().setRelationType(relationType);
cmd.setReqUserId(userId);
cmd.setReqSysOrigin(REQ_SYS_ORIGIN);
return pairUserProfileQryExe.execute(cmd)
.stream()
.filter(item -> Objects.nonNull(item.getCpUserProfile())
&& Objects.equals(item.getCpUserProfile().getId(), cpUserId))
.findFirst()
.orElse(null);
}
private UserPair findPair(List<BaseInfo> candidates, Integer sendSex, Integer acceptSex,
String relationType) {
for (BaseInfo send : candidates) {
if (!Objects.equals(send.getUserSex(), sendSex) || hasWaitApply(send.getId(), relationType)
|| cpRelationshipService.countCp(send.getId()) >= 4) {
continue;
}
for (BaseInfo accept : candidates) {
if (Objects.equals(send.getId(), accept.getId())
|| !Objects.equals(accept.getUserSex(), acceptSex)
|| hasReceivedWaitApply(accept.getId(), relationType)
|| cpRelationshipService.countCp(accept.getId()) >= 4
|| cpRelationshipService.existsCp(send.getId(), accept.getId(), relationType)) {
continue;
}
if (userRegionGateway.checkEqRegion(send.getId(), accept.getId())) {
return new UserPair(send.getId(), accept.getId());
}
}
}
throw new AssertionError("No local candidate pair for " + relationType);
}
private boolean hasWaitApply(Long sendUserId, String relationType) {
return cpApplyService.existsNotProcessSendApply(sendUserId, relationType);
}
private boolean hasReceivedWaitApply(Long acceptUserId, String relationType) {
return cpApplyService.query()
.eq(CpApply::getAcceptApplyUserId, acceptUserId)
.eq(CpApply::getRelationType, relationType)
.eq(CpApply::getStatus, "WAIT")
.count() > 0;
}
private void executeIgnoreDuplicate(String sql) {
try {
jdbcTemplate.execute(sql);
} catch (Exception ignored) {
// Column already exists in local DB.
}
}
private record UserPair(Long sendUserId, Long acceptUserId) {
}
private record RelationPair(Long userId, Long cpUserId, String relationType) {
}
}

131
rc-service/rc-service-other/other-start/src/test/java/RocketMqLocalSmokeTest.java Normal file
View File

@ -0,0 +1,131 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.apache.rocketmq.client.apis.ClientConfiguration;
import org.apache.rocketmq.client.apis.ClientConfigurationBuilder;
import org.apache.rocketmq.client.apis.ClientServiceProvider;
import org.apache.rocketmq.client.apis.StaticSessionCredentialsProvider;
import org.apache.rocketmq.client.apis.consumer.FilterExpression;
import org.apache.rocketmq.client.apis.consumer.FilterExpressionType;
import org.apache.rocketmq.client.apis.consumer.SimpleConsumer;
import org.apache.rocketmq.client.apis.message.MessageView;
import org.apache.rocketmq.client.apis.producer.Producer;
import org.apache.rocketmq.client.apis.producer.SendReceipt;
import org.junit.Test;
import org.springframework.test.annotation.IfProfileValue;
/**
* Local RocketMQ real-connection smoke test. Run explicitly with:
*
* <pre>
* mvn -pl rc-service/rc-service-other/other-start -am \
* -Drocketmq.local.real=true \
* -Dtest=RocketMqLocalSmokeTest#sendAndReceiveOrdinaryMessage test
*
* mvn -pl rc-service/rc-service-other/other-start -am \
* -Drocketmq.local.real=true \
* -Dtest=RocketMqLocalSmokeTest#sendAndReceiveDelayedMessage test
* </pre>
*/
@IfProfileValue(name = "rocketmq.local.real", value = "true")
public class RocketMqLocalSmokeTest {
private static final String DEFAULT_ENDPOINT = "127.0.0.1:18081";
private static final String DEFAULT_TOPIC = "RC_DEFAULT_APP_ORDINARY";
private static final String DEFAULT_DELAY_TOPIC = "RC_DEFAULT_APP_DELAYED";
private static final String TAG = "codex_local_mq_smoke";
@Test
public void sendAndReceiveOrdinaryMessage() throws Exception {
String endpoint = System.getProperty("rocketmq.endpoint", DEFAULT_ENDPOINT);
String topic = System.getProperty("rocketmq.topic", DEFAULT_TOPIC);
sendAndReceive(endpoint, topic, false);
}
@Test
public void sendAndReceiveDelayedMessage() throws Exception {
String endpoint = System.getProperty("rocketmq.endpoint", DEFAULT_ENDPOINT);
String topic = System.getProperty("rocketmq.delayTopic", DEFAULT_DELAY_TOPIC);
sendAndReceive(endpoint, topic, true);
}
private void sendAndReceive(String endpoint, String topic, boolean delayed) throws Exception {
String accessKey = System.getProperty("rocketmq.accessKey", "local");
String secretKey = System.getProperty("rocketmq.secretKey", "local");
String key = "codex-local-mq-" + UUID.randomUUID();
String body = "rocketmq-local-smoke:" + key;
ClientServiceProvider provider = ClientServiceProvider.loadService();
ClientConfiguration clientConfiguration = clientConfiguration(endpoint, accessKey, secretKey);
Producer producer = provider.newProducerBuilder()
.setClientConfiguration(clientConfiguration)
.setTopics(topic)
.build();
try {
org.apache.rocketmq.client.apis.message.MessageBuilder messageBuilder = provider.newMessageBuilder()
.setTopic(topic)
.setTag(TAG)
.setKeys(key)
.setBody(body.getBytes(StandardCharsets.UTF_8));
if (delayed) {
messageBuilder.setDeliveryTimestamp(System.currentTimeMillis() + Duration.ofSeconds(2).toMillis());
}
SendReceipt receipt = producer.send(messageBuilder.build());
assertTrue("message id should not be blank", receipt.getMessageId().toString().length() > 0);
} finally {
producer.close();
}
String group = "codex_local_mq_smoke_" + UUID.randomUUID().toString().replace("-", "");
SimpleConsumer consumer = provider.newSimpleConsumerBuilder()
.setClientConfiguration(clientConfiguration)
.setConsumerGroup(group)
.setSubscriptionExpressions(Collections.singletonMap(
topic, new FilterExpression(TAG, FilterExpressionType.TAG)))
.setAwaitDuration(Duration.ofSeconds(5))
.build();
try {
MessageView matched = receiveByKey(consumer, key);
assertEquals(body, decodeBody(matched.getBody()));
consumer.ack(matched);
} finally {
consumer.close();
}
}
private ClientConfiguration clientConfiguration(String endpoint, String accessKey, String secretKey) {
ClientConfigurationBuilder builder = ClientConfiguration.newBuilder()
.setEndpoints(endpoint)
.setRequestTimeout(Duration.ofSeconds(30));
if (accessKey != null && !accessKey.isEmpty()) {
builder.setCredentialProvider(new StaticSessionCredentialsProvider(accessKey, secretKey));
}
return builder.build();
}
private MessageView receiveByKey(SimpleConsumer consumer, String key) throws Exception {
long deadline = System.currentTimeMillis() + Duration.ofSeconds(30).toMillis();
while (System.currentTimeMillis() < deadline) {
List<MessageView> messages = consumer.receive(16, Duration.ofSeconds(15));
for (MessageView message : messages) {
if (message.getKeys().contains(key)) {
return message;
}
}
}
throw new AssertionError("message not received by key: " + key);
}
private String decodeBody(ByteBuffer body) {
ByteBuffer duplicate = body.asReadOnlyBuffer();
byte[] bytes = new byte[duplicate.remaining()];
duplicate.get(bytes);
return new String(bytes, StandardCharsets.UTF_8);
}
}

13
sql/20260520_cp_relationship_type.sql Normal file
View File

@ -0,0 +1,13 @@
ALTER TABLE `user_cp_apply`
ADD COLUMN `relation_type` varchar(32) NOT NULL DEFAULT 'CP' COMMENT '关系类型：CP/BROTHER/SISTERS' AFTER `accept_apply_user_id`;
ALTER TABLE `user_cp_relationship`
ADD COLUMN `relation_type` varchar(32) NOT NULL DEFAULT 'CP' COMMENT '关系类型：CP/BROTHER/SISTERS' AFTER `cp_user_id`;
UPDATE `user_cp_apply`
SET `relation_type` = 'CP'
WHERE `relation_type` IS NULL OR `relation_type` = '';
UPDATE `user_cp_relationship`
SET `relation_type` = 'CP'
WHERE `relation_type` IS NULL OR `relation_type` = '';