update services zhifu

packages/cpt_services/lib/modules/services/clean_order_detail/clean_order_detail_vm.dart

@@ -131,18 +131,21 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
     switch (actionBtnCode) {
       case '0':
         // proceedWidthPayment
-        vm.handlerExcutePay(true, orderId: _orderId, scallback: (String? orderId, String? orderDetailId){
-          Log.d("成功");
-          int orderid_int = int.parse(orderDetailId!);
-          // 跳入 支付成功页面
-          // ServicePaySuccessPage.startInstance();
-          appRouter.pushAndPopUntil(
-              ServicePaySuccessPageRoute(id: orderid_int, cleanServiceTypeStr: _cleanServiceTypeStr),
-              predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
-            return route.settings.name != 'CleanOrderDetailPageRoute';
-          });
-        }, fcallback: (String? orderId, String? orderDetailId){
-          Log.d("失败");
+        vm.handlerExcutePay(
+            true,
+            orderId: _orderId,
+            scallback: (String? orderId, String? orderDetailId){
+              Log.d("继续支付成功 orderId:$_orderId  orderId1:$orderId  orderDetailId：$orderDetailId");
+              int orderid_int = int.parse(orderDetailId!);
+              // 跳入 支付成功页面
+              // ServicePaySuccessPage.startInstance();
+              context.appRouter.pushAndPopUntil(
+                  ServicePaySuccessPageRoute(id: orderid_int, cleanServiceTypeStr: _cleanServiceTypeStr),
+                  predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
+                return route.settings.name != 'CleanOrderDetailPageRoute';
+              });
+            }, fcallback: (String? orderId, String? orderDetailId){
+            Log.d("失败");
         });
         break;
       case '1':

packages/cpt_services/lib/modules/services/service_order_confirm/service_order_confirm_vm.dart

@@ -499,6 +499,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
       if(asyncGetOrderIdFn != null){
         // 异步获取订单号
       final result = await asyncGetOrderIdFn();
+      Log.d("当前异步获取的订单数据： result:$result");
       if (result is Map<String, dynamic>) {
         // final {'orderId': String? finnalOrderId, 'orderDetailId': String? orderDetailId} = result;
         finnalOrderId = result['orderId'];
@@ -510,6 +511,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
     }
     }else {
       finnalOrderId = orderId!;
+      orderDetailId = orderId!;
     }
 
     Log.d("当前支付的订单ID:$finnalOrderId");

packages/cpt_services/lib/modules/services/service_pay_success/service_pay_success_vm.dart

@@ -4,6 +4,7 @@ import 'package:domain/entity/garage_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
 import 'package:domain/entity/paid_service_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:plugin_platform/engine/loading/loading_engine.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:router/ext/auto_router_extensions.dart';
@@ -228,8 +229,11 @@ class ServicePaySuccessVm extends _$ServicePaySuccessVm {
     if (_needShowPlaceholder) {
       changeLoadingState(LoadState.State_Loading, null);
     }
+    // LoadingEngine.show();
+    // 延迟获取数据
+    // await Future.delayed(const Duration(milliseconds: 2000));
     final result = await servicesRespositoryInstance.fetchPaidServiceCleanOrderDetail(id: id.toString());
-
+    // LoadingEngine.dismiss();
     if (result.isSuccess) {
       state = state.copyWith(datas: result.data );
       changeLoadingState(LoadState.State_Success, null);