更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/scene/ProjectSceneInfoDetailModel.java

@@ -24,7 +24,7 @@ public class ProjectSceneInfoDetailModel extends SuperModel {
     private SceneInfoModel sceneInfo;
 
     @Schema(description = "包含的组件列表")
-    private List<SceneComponentModel> children = new ArrayList<>();
+    private List<SceneComponentModel> components = new ArrayList<>();
 
     @Schema(description = "关联的数据ID")
     private String sceneInfoId;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/OrderController.java

@@ -47,4 +47,11 @@ public class OrderController {
         return expenseFlowService.getOrderPayDetail(param.getId());
     }
 
+//    @ResourceAuth(value = "user", type = AuthType.User)
+//    @Operation(summary = "开始支付订单")
+//    @RequestMapping(value = {"payOrder"}, method = {RequestMethod.POST})
+//    public ResultContent payOrder(@RequestBody IDParam param) {
+//        return orderService.initPayOrder(param.getId());
+//    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -51,6 +51,9 @@ public class CommonService {
     }
 
     public Object updateData(String id, Map<String, Object> standardData, String collectionName) {
+        if (standardData == null || standardData.isEmpty()) {
+            return null;
+        }
         collectionName = CommonUtil.getCollectionName(collectionName);
         Query query = new Query(Criteria.where("_id").is(id));
         Update update = new Update();
@@ -64,6 +67,9 @@ public class CommonService {
     }
 
     public Object updateData(Map<String, Object> where, Map<String, Object> standardData, String collectionName) {
+        if (standardData == null || standardData.isEmpty()) {
+            return null;
+        }
         collectionName = CommonUtil.getCollectionName(collectionName);
         Criteria criteria = new Criteria();
         if (where != null) {

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

@@ -403,8 +403,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             expenseFlowDao.save(entity);
             return ResultContent.buildSuccess(entity);
         }
-        expenseFlowDao.save(entity);
 
+        expenseFlowDao.save(entity);
         if (entity.getOrderModeType() == OrderModeType.Consume) {
             // 支付
             payCallService.payOrder(entity);
@@ -885,11 +885,11 @@ 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()) {
+                if (entity.getExpirationTime() >= System.currentTimeMillis()) {
                     isCanPay = Boolean.TRUE;
                 } else {
                     payMsg = "支付超时";
-
+                    markOrderTimeOut(entity);
                 }
             } else {
                 payMsg = entity.getVerifyParamMsg();
@@ -909,6 +909,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         if (entity != null) {
             Map<String, Object> standardData = new HashMap<>();
             standardData.put("orderState", OrderState.CLOSED);
+            standardData.put("payRemark", "超时关闭");
             commonService.updateData(entity.getId(), standardData, ExpenseFlow.class.getSimpleName());
         }
     }

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

@@ -98,4 +98,9 @@ public class OrderService extends SuperService {
         return expenseFlowService.getOrderPayDetail(expenseFlow.getId());
     }
 
+//    public ResultContent initPayOrder(String id) {
+//        ExpenseFlow expenseFlow = expenseFlowService
+//        return ResultContent.buildSuccess();
+//    }
+
 }

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

@@ -240,7 +240,7 @@ public class ProjectSceneInfoService extends SuperService {
         if (ObjectUtils.isNotEmpty(entity)) {
             BeanUtils.copyProperties(entity, model);
             model.setSceneInfo(sceneInfoService.toModel(entity.getSceneInfo()));
-            model.setChildren(sceneInfoService.getSceneAllComponents(entity.getSceneInfoId()));
+            model.setComponents(sceneInfoService.getSceneAllComponents(entity.getSceneInfoId()));
         }
         return model;
     }