更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -53,6 +53,8 @@ import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
 import com.zhongshu.payment.client.pay.service.OrderPayFeignService;
 import com.zhongshu.payment.client.pay.service.WalletFeignService;
+import com.zhongshu.payment.client.payModel.balance.BalanceModel;
+import com.zhongshu.payment.client.payModel.balance.BalanceQueryParam;
 import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
 import com.zhongshu.payment.client.types.WalletType;
 import lombok.extern.slf4j.Slf4j;
@@ -498,14 +500,16 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                 // 金额 转为 元 单位
                 result.setAmount(CommonUtil.turnMoney2Show(expenseFlow.getPayAmount()));
 
-                if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
-                    ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, "", expenseFlow.getUserId());
-                    if (content.isSuccess()) {
-                        WalletModel walletModel = content.getContent();
-                        if (ObjectUtils.isNotEmpty(walletModel)) {
-                            result.setMoney(CommonUtil.turnMoney2Show(walletModel.getAmount()));
-                        }
-                    }
+                // 查询余额
+                BalanceQueryParam param = new BalanceQueryParam();
+                param.setProjectOid(expenseFlow.getProjectOid());
+                param.setPaymentType(expenseFlow.getPaymentType());
+                param.setWalletType(WalletType.User);
+                param.setUserId(expenseFlow.getUserId());
+                ResultContent<BalanceModel> queryBalance = orderPayFeignService.queryBalance(param);
+                if (queryBalance.isSuccess()) {
+                    BalanceModel balanceModel = queryBalance.getContent();
+                    result.setMoney(CommonUtil.turnMoney2Show(balanceModel.getAmount()));
                 }
             } else {
                 result.setFailed(expenseFlow.getPayRemark());