|
|
@@ -200,9 +200,9 @@ public class WalletService {
|
|
|
R<WalletOverview> wallet = payCenterService.general(relation);
|
|
|
if (wallet.getStatus()) {
|
|
|
WalletOverview data = wallet.getData();
|
|
|
- return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney()), String.valueOf(data.getTotalMoney() / 100D), data.getChannelTotal(), data.getChannels());
|
|
|
+ return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney() / 100D), String.valueOf(data.getChargingMoney()), String.valueOf(data.getWdingMoney()), data.getChannelTotal(), data.getChannels());
|
|
|
}
|
|
|
- return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", 0, new ArrayList<>());
|
|
|
+ return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", "-", 0, new ArrayList<>());
|
|
|
}
|
|
|
|
|
|
/**
|