更新

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

@@ -318,13 +318,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setVerifyParamMsg("用户未注册");
             return;
         }
+        entity.setUserName(userAccount.getName());
+        entity.setUserAccount(userAccount);
+
         if (userAccount.getState() == UserState.Locked) {
             entity.setVerifyParamIsSuccess(Boolean.FALSE);
             entity.setVerifyParamMsg("用户已锁定");
             return;
         }
-        entity.setUserName(userAccount.getName());
-        entity.setUserAccount(userAccount);
 
         // 个人钱包
         if (paymentType == PaymentType.UserWallet) {
@@ -409,42 +410,6 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildSuccess(entity);
     }
 
-    /**
-     * 查询构建支付返回结果
-     *
-     * @param orderNo
-     * @param cardNo
-     * @return
-     */
-    public ConsumTransactionsResult buildConsumTransactionsResult(String orderNo, String cardNo) {
-        ConsumTransactionsResult result = new ConsumTransactionsResult();
-        ExpenseFlow expenseFlow = expenseFlowDao.findTopByOrderNoAndCardNoOrderByCreateTimeDesc(orderNo, cardNo);
-        if (ObjectUtils.isNotEmpty(expenseFlow)) {
-            Boolean isPaySuccess = expenseFlow.getIsPaySuccess();
-            if (isPaySuccess != null && isPaySuccess) {
-                result.setSuccess();
-                // 设置了显示异常，去掉
-//                result.setText(expenseFlow.getPayRemark());
-                result.setCardNo(expenseFlow.getCardNo());
-                result.setName(expenseFlow.getUserName());
-                // 金额 转为 元 单位
-                result.setAmount(CommonUtil.turnMoney2Show(expenseFlow.getPayAmount()));
-                if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
-                    // 钱包查询余额
-                    Wallet wallet = walletDao.findByUserId(expenseFlow.getUserId());
-                    if (ObjectUtils.isNotEmpty(wallet)) {
-                        result.setMoney(CommonUtil.turnMoney2Show(wallet.getAmount()));
-                    }
-                }
-            } else {
-                result.setFailed(expenseFlow.getPayRemark());
-            }
-        } else {
-            result.setFailed("未查询到订单");
-        }
-        return result;
-    }
-
     /**
      * 查询构建支付返回结果
      *