moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会-提现-账户-国家-排序

Browse Source
This commit is contained in:
khalil
2025-06-24 17:32:15 +08:00
parent ea03e83e58
commit 5d8a383045
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdWithdrawAccountConfigAdminService.java
View File

@@ -77,7 +77,9 @@ public class GuildUsdWithdrawAccountConfigAdminService {
return voPage;
}
public void save(Integer partitionId, String accountType, String country, BigDecimal usdRatio, BigDecimal withdrawRate, Integer seq, int adminId) {
public void save(Integer partitionId, String accountType, String country,
BigDecimal usdRatio, BigDecimal withdrawRate,
Boolean enable, Integer seq, int adminId) {
GuildUsdWithdrawAccountConfig config = service.lambdaQuery()
.eq(GuildUsdWithdrawAccountConfig::getPartitionId, partitionId)
.eq(GuildUsdWithdrawAccountConfig::getAccountType, accountType)
@@ -93,6 +95,7 @@ public class GuildUsdWithdrawAccountConfigAdminService {
.eq(GuildUsdWithdrawAccountConfig::getCountry, country)
.set(GuildUsdWithdrawAccountConfig::getUsdRatio, usdRatio)
.set(GuildUsdWithdrawAccountConfig::getFeeRate, withdrawRate)
.set(GuildUsdWithdrawAccountConfig::getEnable, enable)
.set(GuildUsdWithdrawAccountConfig::getSeq, seq)
.set(GuildUsdWithdrawAccountConfig::getUpdateTime, new Date())
.set(GuildUsdWithdrawAccountConfig::getAdminId, adminId)

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildUsdWithdrawAccountConfigController.java
View File

@@ -94,14 +94,14 @@ public class GuildUsdWithdrawAccountConfigController extends BaseController {
@ApiImplicitParam(name = "seq", value = "顺序", required = true),
})
public BusiResult<Void> save(Integer partitionId, String accountType, String country,
BigDecimal usdRatio, BigDecimal withdrawRate, Integer seq) {
BigDecimal usdRatio, BigDecimal withdrawRate, Boolean enable, Integer seq) {
if (null == partitionId ||
!StringUtils.hasText(accountType) || !StringUtils.hasText(country) ||
null == usdRatio || null == withdrawRate || null == seq){
throw new AdminServiceException(BusiStatus.PARAMERROR);
}
int adminId = getAdminId();
service.save(partitionId, accountType, country, usdRatio, withdrawRate, seq, adminId);
service.save(partitionId, accountType, country, usdRatio, withdrawRate, enable, seq, adminId);
return BusiResult.success();
}
}

1
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberUsdWithdrawAccountVo.java
View File

@@ -24,5 +24,4 @@ public class GuildMemberUsdWithdrawAccountVo {
@ApiModelProperty("是否已绑定")
private Boolean hasBound;
}

1
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildUsdWithdrawAccountVo.java
View File

@@ -33,6 +33,7 @@ public class GuildUsdWithdrawAccountVo {
private String currency;
private BigDecimal usdRatio;
private BigDecimal feeRate;
private Integer seq;
}
}

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawAccountConfigService.java
View File

@@ -16,6 +16,7 @@ public class GuildUsdWithdrawAccountConfigService extends ServiceImpl<GuildUsdWi
.in(GuildUsdWithdrawAccountConfig::getAccountType, accountTypeList)
.eq(GuildUsdWithdrawAccountConfig::getPartitionId, partitionId)
.eq(GuildUsdWithdrawAccountConfig::getEnable, Boolean.TRUE)
.orderByAsc(GuildUsdWithdrawAccountConfig::getSeq)
.list();
}

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawAccountService.java
View File

@@ -78,7 +78,6 @@ public class GuildUsdWithdrawAccountService extends ServiceImpl<GuildUsdWithdraw
vo.setCurrency(config.getCurrency());
vo.setUsdRatio(config.getUsdRatio());
vo.setWithdrawRate(config.getFeeRate());
return vo;
}).toList();
}
@@ -122,9 +121,11 @@ public class GuildUsdWithdrawAccountService extends ServiceImpl<GuildUsdWithdraw
country.setCurrency(config.getCurrency());
country.setUsdRatio(config.getUsdRatio());
country.setFeeRate(config.getFeeRate());
country.setSeq(config.getSeq());
}
return country;
})
.sorted(Comparator.comparing(GuildUsdWithdrawAccountVo.Country::getSeq))
.collect(Collectors.toList()));
accountVo.setFields(accountFields);