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

修复提现配置保存问题

Browse Source
This commit is contained in:
liaozetao
2023-07-12 16:44:52 +08:00
parent 80e5a67eb5
commit 76c3ea066d
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/impl/ExchangeRateAdminServiceImpl.java
View File

@@ -41,7 +41,7 @@ public class ExchangeRateAdminServiceImpl implements ExchangeRateAdminService {
CurrencyTypeEnum.CNY.getValue(),
CurrencyTypeEnum.MYR.getValue(),
CurrencyTypeEnum.SGD.getValue(),
CurrencyTypeEnum.UNKNOW.getValue())));
CurrencyTypeEnum.USD.getValue())));
if (CollectionUtil.isEmpty(list)) {
return;
}
@@ -61,8 +61,8 @@ public class ExchangeRateAdminServiceImpl implements ExchangeRateAdminService {
exchangeRate.setRate(sgd);
exchangeRateService.saveOrUpdate(exchangeRate);
}
if (exchangeRateMap.containsKey(CurrencyTypeEnum.UNKNOW.getValue())) {
ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.UNKNOW.getValue());
if (exchangeRateMap.containsKey(CurrencyTypeEnum.USD.getValue())) {
ExchangeRate exchangeRate = exchangeRateMap.get(CurrencyTypeEnum.USD.getValue());
exchangeRate.setRate(other);
exchangeRateService.saveOrUpdate(exchangeRate);
}

14
accompany-admin/accompany-admin-web/src/main/resources/static/html/withdraw/withdraw_config.html
View File

@@ -44,9 +44,9 @@
</div>
</div>
<div class="form-group">
<label for="min" class="col-sm-3 control-label">提现手续费：</label>
<label for="chargeRate" class="col-sm-3 control-label">提现手续费：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="min">
<input type="text" class="form-control" id="chargeRate">
</div>
</div>
<div class="form-group">
@@ -121,25 +121,25 @@
<div class="modal-body">
<form class="form-horizontal">
<div class="form-group">
<label for="minValue" class="col-sm-3 control-label">CNY：</label>
<label for="cny" class="col-sm-3 control-label">CNY：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="cny"/>
</div>
</div>
<div class="form-group">
<label for="weekMaxValue" class="col-sm-3 control-label">MYR：</label>
<label for="myr" class="col-sm-3 control-label">MYR：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="myr"/>
</div>
</div>
<div class="form-group">
<label for="weekLimitCount" class="col-sm-3 control-label">SGD：</label>
<label for="sgd" class="col-sm-3 control-label">SGD：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="sgd"/>
</div>
</div>
<div class="form-group">
<label for="min" class="col-sm-3 control-label">其它账户：</label>
<label class="col-sm-3 control-label">其它账户：</label>
<div class="col-sm-9"> 1 </div>
</div>
</form>
@@ -342,7 +342,7 @@
weekMaxValue: $('#weekMaxValue').val(),
weekLimitCount: $('#weekLimitCount').val(),
chargeRate: $('#chargeRate').val(),
accounts: accounts
accounts: JSON.stringify(accounts)
}
$.ajax({
type: "post",

12
accompany-business/accompany-business-service/src/main/java/com/accompany/business/dto/exchange/WithdrawConfigDto.java
View File

@@ -1,11 +1,14 @@
package com.accompany.business.dto.exchange;
import cn.hutool.core.util.StrUtil;
import com.accompany.business.model.withdraw.WithdrawAccountDtl;
import com.alibaba.fastjson.JSONArray;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
@Data
@@ -58,6 +61,13 @@ public class WithdrawConfigDto {
* 账户
*/
@ApiModelProperty("账户")
private List<WithdrawAccountDtl> accounts;
private String accounts;
public List<WithdrawAccountDtl> getAccounts() {
if (StrUtil.isNotEmpty(accounts)) {
return JSONArray.parseArray(accounts, WithdrawAccountDtl.class);
}
return Collections.emptyList();
}
}