TRX 1 год назад
Родитель
Сommit
eeb16ebf7d

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -180,12 +180,13 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                 // 支付
                 // 支付
                 payCallService.payOrder(entity);
                 payCallService.payOrder(entity);
             } else if (entity.getMode() == 2) {
             } else if (entity.getMode() == 2) {
-                // 查询余额模式
+                // 查询余额模式 因为只有钱包有余额,所以 默认默认为钱包支付渠道
                 entity.setOrderModeType(OrderModeType.BalanceInquiry);
                 entity.setOrderModeType(OrderModeType.BalanceInquiry);
                 entity.setPaymentStatus("查询余额");
                 entity.setPaymentStatus("查询余额");
                 entity.setPayRemark("查询余额");
                 entity.setPayRemark("查询余额");
                 entity.setOrderState(OrderState.PAID_ERROR);
                 entity.setOrderState(OrderState.PAID_ERROR);
                 entity.setIsPaySuccess(Boolean.TRUE);
                 entity.setIsPaySuccess(Boolean.TRUE);
+                entity.setPaymentType(PaymentType.UserWallet);
                 expenseFlowDao.save(entity);
                 expenseFlowDao.save(entity);
             }
             }
         }
         }

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -440,7 +440,7 @@ public class PayCallService extends SuperService {
      */
      */
     public BigDecimal queryBalance(ExpenseFlow entity) {
     public BigDecimal queryBalance(ExpenseFlow entity) {
         BigDecimal balance = BigDecimal.ZERO;
         BigDecimal balance = BigDecimal.ZERO;
-        if (entity.getPaymentType() == PaymentType.UserWallet) {
+        if (entity.getPaymentType() == null || entity.getPaymentType() == PaymentType.UserWallet) {
             com.github.microservice.pay.client.ret.ResultContent<Long> resultContent = balancePayService.queryUserBalance(entity.getProjectOid(), entity.getUserId());
             com.github.microservice.pay.client.ret.ResultContent<Long> resultContent = balancePayService.queryUserBalance(entity.getProjectOid(), entity.getUserId());
             if (resultContent.getState() == com.github.microservice.pay.client.ret.ResultState.Success) {
             if (resultContent.getState() == com.github.microservice.pay.client.ret.ResultState.Success) {
                 long number = resultContent.getContent();
                 long number = resultContent.getContent();