更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowPayShowModel.java

@@ -1,10 +1,8 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.zhongshu.card.client.model.base.SuperModel;
+import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
-import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationPayInfoModel;
-import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -19,7 +17,24 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ExpenseFlowPayShowModel extends SuperModel {
+public class ExpenseFlowPayShowModel {
+
+    @Schema(description = "数据id")
+    private String id;
+
+    @Schema(description = "创建时间")
+    private Long createTime;
+
+    private OrderState orderState;
+
+    private String orderStateStr;
+
+    public String getOrderStateStr() {
+        if (orderState == null) {
+            return orderState.getRemark();
+        }
+        return "";
+    }
 
     @Schema(description = "消费订单号")
     private String orderNo;

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

@@ -20,6 +20,7 @@ import com.github.microservice.types.payment.PaymentDeviceType;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.model.org.UserJoinBusOrgModel;
+import com.zhongshu.card.client.model.pay.RechargeOrderModel;
 import com.zhongshu.card.client.model.payment.*;
 import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
 import com.zhongshu.card.client.model.payment.statistic.StatisticItem;
@@ -890,6 +891,15 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildSuccess(model);
     }
 
+    public ResultContent getOrderPayDetail1(String id) {
+        RechargeOrderModel model1 = new RechargeOrderModel();
+
+
+        ExpenseFlow entity = expenseFlowDao.findTopById(id);
+        ExpenseFlowPayShowModel model = toPayShowModel(entity);
+        return ResultContent.buildSuccess(model);
+    }
+
     /**
      * 支付订单的详情（简要）转换
      *
@@ -949,7 +959,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     public void markOrderTimeOut(ExpenseFlow entity) {
         if (entity != null) {
             Map<String, Object> standardData = new HashMap<>();
-            standardData.put("orderState", OrderState.CLOSED);
+            standardData.put("orderState", OrderState.Expired);
             standardData.put("payRemark", "超时关闭");
             commonService.updateData(entity.getId(), standardData, ExpenseFlow.class.getSimpleName());
         }