更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/scene/SceneInfoController.java

@@ -37,7 +37,7 @@ public class SceneInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "场景列表-分页查询", description = "场景列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<SceneInfoModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) SceneInfoSearch param) {
+    public ResultContent<Page<SceneInfoAboutComModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) SceneInfoSearch param) {
         return sceneInfoService.page(param, pageable);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dataConfig/OrderConfig.java

@@ -6,7 +6,7 @@ package com.zhongshu.card.server.core.dataConfig;
  */
 public class OrderConfig {
 
-    // 订单最大有效时间
+    // 订单最大有效时间 (默认设置)
     public static final Long orderExpirationTime = 5 * 60 * 1000L;
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -72,7 +72,7 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "订单生效时间")
     private Long startTime;
 
-    @Schema(description = "订单失效时间")
+    @Schema(description = "订单支付失效时间， （不会为空，有默认值）")
     private Long expirationTime;
 
     @Schema(description = "消费金额（单位：分）")
@@ -171,7 +171,7 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "支付订单状态")
     private String paymentStatus;
 
-    @Schema(description = "支付是否成功")
+    @Schema(description = "支付是否成功，为空就是未支付过")
     private Boolean isPaySuccess;
 
     @Schema(description = "调用支付的 支付结果，保存支付结果返回的以后要使用的参数")

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

@@ -46,6 +46,7 @@ import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
+import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissVerifyService;
@@ -64,10 +65,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -119,6 +117,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
 
     @Autowired
     private OrganizationManagerServiceImpl organizationManagerService;
+    @Autowired
+    private CommonService commonService;
 
     /**
      * 创建流水
@@ -885,7 +885,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             OrderState orderState = entity.getOrderState();
             // 订单参数验证成功，并且 未支付
             if (entity.getVerifyParamIsSuccess() != null && entity.getVerifyParamIsSuccess() && orderState == OrderState.WAIT_PAYMENT) {
+                if (entity.getExpirationTime() <= System.currentTimeMillis()) {
+                    isCanPay = Boolean.TRUE;
+                } else {
+                    payMsg = "支付超时";
 
+                }
+            } else {
+                payMsg = entity.getVerifyParamMsg();
             }
         }
         model.setIsCanPay(isCanPay);
@@ -899,7 +906,11 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
      * @param entity
      */
     public void markOrderTimeOut(ExpenseFlow entity) {
-
+        if (entity != null) {
+            Map<String, Object> standardData = new HashMap<>();
+            standardData.put("orderState", OrderState.CLOSED);
+            commonService.updateData(entity.getId(), standardData, ExpenseFlow.class.getSimpleName());
+        }
     }
 
     /**

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/scene/SceneInfoService.java

@@ -86,9 +86,9 @@ public class SceneInfoService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
-    public ResultContent<Page<SceneInfoModel>> page(SceneInfoSearch param, Pageable pageable) {
+    public ResultContent<Page<SceneInfoAboutComModel>> page(SceneInfoSearch param, Pageable pageable) {
         Page<SceneInfo> page = sceneInfoDao.page(pageable, param);
-        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
+        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toAboutComModel));
     }
 
     /**