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

代理政策新增国家code

Browse Source
This commit is contained in:
tianfeng 2026-02-02 11:05:57 +08:00
parent d6825afe1a
commit 6e6272bffc
13 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/team/target/api/TeamPolicyManagerClientApi.java
View File

@ -30,7 +30,8 @@ public interface TeamPolicyManagerClientApi {
ResultResponse<TeamPolicyManagerDTO> getReleaseByRegionAndType(
@RequestParam("sysOrigin") String sysOrigin,
@RequestParam("region") String region,
@RequestParam("policyType") String policyType);
@RequestParam("policyType") String policyType,
@RequestParam("countryCode") String countryCode);
@PostMapping("/mapRegionRelease")
ResultResponse<Map<String, TeamPolicyManagerDTO>> mapRegionRelease(
@ -38,7 +39,10 @@ public interface TeamPolicyManagerClientApi {
@GetMapping("/listSysOriginRegion")
ResultResponse<List<TeamPolicyManagerDTO>> listSysOriginRegion(
@RequestParam("sysOrigin") String sysOrigin, @RequestParam("region") String region, @RequestParam("policyType") String policyType);
@RequestParam("sysOrigin") String sysOrigin,
@RequestParam("region") String region,
@RequestParam("policyType") String policyType,
@RequestParam("countryCode") String countryCode);
@GetMapping("/listTeamPolicy")
ResultResponse<List<TeamPolicyManagerDTO>> listTeamPolicy(

2
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerBackQryCmd.java
View File

@ -32,4 +32,6 @@ public class TeamPolicyManagerBackQryCmd implements Serializable {
*/
private String policyType;
private String countryCode;
}

5
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/TeamPolicyManagerCmd.java
View File

@ -63,6 +63,11 @@ public class TeamPolicyManagerCmd extends CommonCommand {
*/
private String policyType;
/**
* 国家code
*/
private String countryCode;
/**
* 创建时间.
*/

5
rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/agency/TeamPolicyManagerDTO.java
View File

@ -37,6 +37,11 @@ public class TeamPolicyManagerDTO implements Serializable {
*/
private String region;
/**
* 国家code
*/
private String countryCode;
/**
* true: 曾经对外发布过.
*/

4
rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/TeamPolicyManagerBackServiceImpl.java
View File

@ -33,13 +33,13 @@ public class TeamPolicyManagerBackServiceImpl implements TeamPolicyManagerBackSe
@Override
public List<TeamPolicyManagerCO> historyReleases(TeamPolicyManagerBackQryCmd query) {
return assembleTeamPolicyManagerVO(ResponseAssert.requiredSuccess(teamPolicyManagerClient
.listSysOriginRegion(query.getSysOrigin(), query.getRegion(), query.getPolicyType())));
.listSysOriginRegion(query.getSysOrigin(), query.getRegion(), query.getPolicyType(), query.getCountryCode())));
}
@Override
public TeamPolicyManagerCO getByRegionByType(TeamPolicyManagerBackQryCmd query) {
TeamPolicyManagerDTO teamPolicyManager = ResponseAssert.requiredSuccess(teamPolicyManagerClient
.getReleaseByRegionAndType(query.getSysOrigin(), query.getRegion(), query.getPolicyType()));
.getReleaseByRegionAndType(query.getSysOrigin(), query.getRegion(), query.getPolicyType(), query.getCountryCode()));
if (Objects.isNull(teamPolicyManager)) {
return new TeamPolicyManagerCO();
}

5
rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/TeamPolicyManagerCO.java
View File

@ -38,6 +38,11 @@ public class TeamPolicyManagerCO implements Serializable {
*/
private String region;
/**
* 国家code
*/
private String countryCode;
/**
* true: 曾经对外发布过.
*/

5
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicReportCmd.java
View File

@ -36,4 +36,9 @@ public class DynamicReportCmd extends AppExtCommand {
@NotNull
private Integer reportType;
/**
* 图片集合.
*/
private String imageUrls;
}

5
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/team/team/TeamPolicyManager.java
View File

@ -42,6 +42,11 @@ public class TeamPolicyManager implements Serializable {
*/
private String region;
/**
* 国家code
*/
private String countryCode;
/**
* true: 曾经对外发布过.
*/

4
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamPolicyManagerService.java
View File

@ -30,7 +30,7 @@ public interface TeamPolicyManagerService {
* 获取指定系统区域政策.
* @param policyType 策略类型 MONEY(美金政策)、SALARY_DIAMOND(工资钻石政策).
*/
List<TeamPolicyManager> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType);
List<TeamPolicyManager> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType, String countryCode);
/**
* 获取指定系统区域政策.
@ -54,7 +54,7 @@ public interface TeamPolicyManagerService {
* @param policyType 策略类型 MONEY(美金政策)、SALARY_DIAMOND(工资钻石政策).
* @return 策略
*/
TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType);
TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType, String countryCode);
/**
* 获取区域已发布政策.

11
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamPolicyManagerServiceImpl.java
View File

@ -47,7 +47,8 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService {
}
@Override
public List<TeamPolicyManager> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType) {
public List<TeamPolicyManager> listTeamPolicyAndTypePolicy(String sysOrigin, String region,
String policyType, String countryCode) {
Criteria criteria = new Criteria();
criteria.and("region").is(region);
criteria.and("sysOrigin").is(sysOrigin);
@ -56,6 +57,9 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService {
}else {
criteria.and("policyType").ne(TeamPolicyTypeEnum.SALARY_DIAMOND.name());
}
if (StringUtils.isNotBlank(countryCode)) {
criteria.and("countryCode").is(countryCode);
}
return mongoTemplate.find( Query.query(criteria).with(Sort.by(Sort.Order.desc("createTime"))), TeamPolicyManager.class);
}
@ -81,7 +85,7 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService {
}
@Override
public TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType) {
public TeamPolicyManager getReleaseByRegionAndType(String sysOrigin, String region, String policyType, String countryCode) {
Criteria criteria = new Criteria();
criteria.and("region").is(region);
@ -92,6 +96,9 @@ public class TeamPolicyManagerServiceImpl implements TeamPolicyManagerService {
}else {
criteria.and("policyType").ne(TeamPolicyTypeEnum.SALARY_DIAMOND.name());
}
if (StringUtils.isNotBlank(countryCode)) {
criteria.and("countryCode").is(countryCode);
}
return mongoTemplate.findOne(Query.query(criteria), TeamPolicyManager.class);
}

9
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/endpoint/team/TeamPolicyManagerClientEndpoint.java
View File

@ -41,9 +41,10 @@ public class TeamPolicyManagerClientEndpoint implements TeamPolicyManagerClient
}
@Override
public ResultResponse<TeamPolicyManagerDTO> getReleaseByRegionAndType(String sysOrigin, String region, String policyType) {
public ResultResponse<TeamPolicyManagerDTO> getReleaseByRegionAndType(String sysOrigin, String region,
String policyType, String countryCode) {
return ResultResponse.success(
teamPolicyManagerClientService.getReleaseByRegionAndTypePolicyType(sysOrigin, region, policyType));
teamPolicyManagerClientService.getReleaseByRegionAndTypePolicyType(sysOrigin, region, policyType, countryCode));
}
@Override
@ -53,9 +54,9 @@ public class TeamPolicyManagerClientEndpoint implements TeamPolicyManagerClient
@Override
public ResultResponse<List<TeamPolicyManagerDTO>> listSysOriginRegion(String sysOrigin,
String region, String policyType) {
String region, String policyType, String countryCode) {
return ResultResponse.success(
teamPolicyManagerClientService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType));
teamPolicyManagerClientService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType, countryCode));
}
@Override

5
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/TeamPolicyManagerClientService.java
View File

@ -18,7 +18,8 @@ public interface TeamPolicyManagerClientService {
TeamPolicyManagerDTO getReleaseByRegionAndType(String sysOrigin, String region);
TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, String policyType);
TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region,
String policyType, String countryCode);
Map<String, TeamPolicyManagerDTO> mapRegionRelease(Set<String> regions);
@ -26,7 +27,7 @@ public interface TeamPolicyManagerClientService {
List<TeamPolicyManagerDTO> listTeamPolicy(String sysOrigin, String region);
List<TeamPolicyManagerDTO> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType);
List<TeamPolicyManagerDTO> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType, String countryCode);
void add(TeamPolicyManagerCmd cmd);

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

@ -36,9 +36,10 @@ public class TeamPolicyManagerClientServiceImpl implements TeamPolicyManagerClie
}
@Override
public TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region, String policyType) {
public TeamPolicyManagerDTO getReleaseByRegionAndTypePolicyType(String sysOrigin, String region,
String policyType, String countryCode) {
return teamAppConvertor.toTeamPolicyManagerDTO(
teamPolicyManagerService.getReleaseByRegionAndType(sysOrigin, region, policyType));
teamPolicyManagerService.getReleaseByRegionAndType(sysOrigin, region, policyType, countryCode));
}
@ -61,9 +62,10 @@ public class TeamPolicyManagerClientServiceImpl implements TeamPolicyManagerClie
}
@Override
public List<TeamPolicyManagerDTO> listTeamPolicyAndTypePolicy(String sysOrigin, String region, String policyType) {
public List<TeamPolicyManagerDTO> listTeamPolicyAndTypePolicy(String sysOrigin, String region,
String policyType, String countryCode) {
return teamAppConvertor.toListTeamPolicyManagerDTO(
teamPolicyManagerService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType));
teamPolicyManagerService.listTeamPolicyAndTypePolicy(sysOrigin, region, policyType, countryCode));
}
@Override