更新！

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

@@ -445,12 +445,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         String orderNo = ret.getOutTradeNo();
 
         String status = "";
+        String msg = "";
         ExpenseFlow expenseFlow = expenseFlowDao.findTopByPaymentNo(orderNo);
         if (ObjectUtils.isNotEmpty(expenseFlow)) {
             // 支付结果状态
             switch (ret.getTradeState()) {
                 case "SUCCESS" -> {
                     status = RechargeOrderStatus.Success.name();
+                    msg = "支付成功";
                     log.info("收到的消息Success：{}", JsonUtil.toJson(ret));
                     expenseFlow.setOrderState(OrderState.HAVE_PAID);
                     expenseFlow.setPayRemark(ret.getTradeStateDesc());
@@ -460,7 +462,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
 
                     if (content.getState() == com.github.microservice.pay.client.ret.ResultState.Success) {
                         // 关联参数
-                        String msg = "支付成功";
+                        msg = "支付成功";
                         List<TransactionLogModel> list = content.getContent();
                         expenseFlow.setTransactionIds(list);
                         expenseFlow.setPaymentStatus(msg);
@@ -476,6 +478,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                     expenseFlow.setPayRemark(ret.getTradeStateDesc());
                     expenseFlow.setIsPaySuccess(Boolean.FALSE);
                     expenseFlowDao.save(expenseFlow);
+                    msg = expenseFlow.getPayRemark();
                 }
                 case "CLOSED" -> {
                     status = RechargeOrderStatus.Cancel.name();
@@ -483,6 +486,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                     expenseFlow.setPayRemark(ret.getTradeStateDesc());
                     expenseFlow.setIsPaySuccess(Boolean.FALSE);
                     expenseFlowDao.save(expenseFlow);
+                    msg = expenseFlow.getPayRemark();
                 }
             }
         } else {
@@ -492,7 +496,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         // 发送消息
         SendMessageModel sendMessageModel = new SendMessageModel();
         sendMessageModel.setMessage(JsonUtil.toJson(Map.of("status", status,
-                "paymentNo", expenseFlow.getPaymentNo())));
+                "orderNo", expenseFlow.getPaymentNo(), "msg", msg)));
         String userId = expenseFlow.getUserId();
         String topic = String.format("/wechat/pay/%s", userId);
         sendMessageModel.setTopic(topic);