更新！

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

@@ -21,6 +21,6 @@ import java.util.List;
 public class SceneInfoAboutComModel extends SceneInfoModel {
 
     @Schema(description = "包含的组件列表")
-    private List<SceneComponentModel> children = new ArrayList<>();
+    private List<SceneComponentModel> components = new ArrayList<>();
 
 }

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

@@ -879,10 +879,29 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
      */
     public OrderPayModel isCanPay(ExpenseFlow entity) {
         OrderPayModel model = new OrderPayModel();
+        Boolean isCanPay = Boolean.FALSE;
+        String payMsg = "";
+        if (ObjectUtils.isNotEmpty(entity)) {
+            OrderState orderState = entity.getOrderState();
+            // 订单参数验证成功，并且 未支付
+            if (entity.getVerifyParamIsSuccess() != null && entity.getVerifyParamIsSuccess() && orderState == OrderState.WAIT_PAYMENT) {
 
+            }
+        }
+        model.setIsCanPay(isCanPay);
+        model.setPayMsg(payMsg);
         return model;
     }
 
+    /**
+     * 标记订单已超时
+     *
+     * @param entity
+     */
+    public void markOrderTimeOut(ExpenseFlow entity) {
+
+    }
+
     /**
      * 模型转换
      *

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

@@ -91,6 +91,12 @@ public class SceneInfoService extends SuperService {
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }
 
+    /**
+     * 得到应用详情（包括组件）
+     *
+     * @param id
+     * @return
+     */
     public ResultContent<SceneInfoAboutComModel> getDetailById(String id) {
         SceneInfo entity = sceneInfoDao.findTopById(id);
         if (ObjectUtils.isEmpty(entity)) {
@@ -156,6 +162,8 @@ public class SceneInfoService extends SuperService {
                     if (ObjectUtils.isEmpty(component)) {
                         component = new SceneComponent();
                     }
+                    component.setSceneInfo(sceneInfo);
+                    component.setSceneInfoId(sceneInfo.getId());
                     BeanUtils.copyProperties(param, component);
                     componentEntitys.add(component);
                     if (StringUtils.isNotEmpty(param.getId()) && ids.contains(param.getId())) {
@@ -224,7 +232,7 @@ public class SceneInfoService extends SuperService {
         if (ObjectUtils.isNotEmpty(entity)) {
             BeanUtils.copyProperties(entity, model);
             // 场景包含的组件
-            model.setChildren(getSceneAllComponents(entity.getId()));
+            model.setComponents(getSceneAllComponents(entity.getId()));
         }
         return model;
     }