|
@@ -488,13 +488,11 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
|
|
|
if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
|
|
if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
|
|
|
com.zhongshu.payment.client.ret.ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, null, expenseFlow.getUserId());
|
|
com.zhongshu.payment.client.ret.ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, null, expenseFlow.getUserId());
|
|
|
if (content.isSuccess()) {
|
|
if (content.isSuccess()) {
|
|
|
- result.setMoney(CommonUtil.turnMoney2Show(content.getContent().getAmount()));
|
|
|
|
|
|
|
+ WalletModel walletModel = content.getContent();
|
|
|
|
|
+ if (ObjectUtils.isNotEmpty(walletModel)) {
|
|
|
|
|
+ result.setMoney(CommonUtil.turnMoney2Show(walletModel.getAmount()));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-// // 钱包查询余额
|
|
|
|
|
-// Wallet wallet = walletDao.findByUserId(expenseFlow.getUserId());
|
|
|
|
|
-// if (ObjectUtils.isNotEmpty(wallet)) {
|
|
|
|
|
-// result.setMoney(CommonUtil.turnMoney2Show(wallet.getAmount()));
|
|
|
|
|
-// }
|
|
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
result.setFailed(expenseFlow.getPayRemark());
|
|
result.setFailed(expenseFlow.getPayRemark());
|