更新！

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

@@ -402,6 +402,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         if (ObjectUtils.isEmpty(expenseFlow)) {
             return ResultContent.buildFail("订单不存在");
         }
+        // 判断是否可以支付
         OrderPayModel orderPayModel = isCanPay(expenseFlow);
         if (!orderPayModel.isSuccess()) {
             return ResultContent.buildFail(orderPayModel.getPayMsg());
@@ -424,7 +425,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             prepayParam.setTotal(expenseFlow.getPayAmount().longValue());
             ResultContent<Object> resultContent = wechatPayService.prepay(prepayParam);
             if (resultContent.isSuccess()) {
-                value = resultContent.getCode();
+                value = resultContent.getContent();
             } else {
                 return ResultContent.buildFail(resultContent.getMsg());
             }
@@ -1036,9 +1037,10 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
 
             OrderState orderState = entity.getOrderState();
             // 等待支付或支付失败，可以支付
-            if (orderState != OrderState.WAIT_PAYMENT || orderState != OrderState.PAID_ERROR) {
+            if (orderState != OrderState.WAIT_PAYMENT && orderState != OrderState.PAID_ERROR) {
                 return model.setFiled(String.format("订单状态：%S", orderState.getRemark()));
             }
+
             if (entity.getExpirationTime() <= System.currentTimeMillis()) {
                 markOrderTimeOut(entity);
                 return model.setFiled("支付超时");