cabloy 5.1.131 → 5.1.133

package/zova/src/suite/a-commerce/modules/commerce-trade/src/component/tableCellActionRefund/controller.tsx

@@ -4,7 +4,10 @@ import type { IJsxRenderContextTableCell } from 'zova-module-a-table';
 import { BeanControllerBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
-import type { ApiSchemaCommerceTradeDtoOrderSelectResItem } from '../../api/openapi/schemas.js';
+import type {
+  ApiSchemaCommerceTradeDtoOrderSelectResItem,
+  ApiSchemaCommerceTradeDtoRefundRecoveryView,
+} from '../../api/openapi/schemas.js';
 import type { ITableCellOptionsActionRefund } from '../../bean/tableCell.actionRefund.js';
 import type { ModelOrder } from '../../model/order.js';
 
@@ -22,8 +25,14 @@ export class ControllerTableCellActionRefund extends BeanControllerBase {
 
   reason = '';
   confirmed = false;
+  recoveryOpen = false;
+  recoveryLoaded = false;
+  recoveryReason = '';
+  retryRiskAcknowledged = false;
   approveIdempotencyKey?: string;
   rejectIdempotencyKey?: string;
+  reconcileIdempotencyKey?: string;
+  retryIdempotencyKey?: string;
 
   private async _approve() {
     const reason = this.reason.trim();
@@ -51,47 +60,157 @@ export class ControllerTableCellActionRefund extends BeanControllerBase {
     await this.$$modelOrder.executeRefund(orderId).mutateAsync(undefined);
   }
 
+  private _recovery() {
+    const orderId = this.$$renderContext.cellContext.row.id as TableIdentity;
+    return this.$$modelOrder.refundRecovery(orderId);
+  }
+
+  private async _toggleRecovery() {
+    this.recoveryOpen = !this.recoveryOpen;
+    if (this.recoveryOpen && !this.recoveryLoaded) {
+      await this._recovery().refetch();
+      this.recoveryLoaded = true;
+    }
+  }
+
+  private async _reconcile() {
+    const reason = this.recoveryReason.trim();
+    if (!reason) return;
+    const orderId = this.$$renderContext.cellContext.row.id as TableIdentity;
+    const actionIdempotencyKey = this.reconcileIdempotencyKey ?? crypto.randomUUID();
+    this.reconcileIdempotencyKey = actionIdempotencyKey;
+    await this.$$modelOrder
+      .reconcileRefund(orderId)
+      .mutateAsync({ reason, actionIdempotencyKey, acknowledgeRetryRisk: false });
+    this.reconcileIdempotencyKey = undefined;
+    await this._recovery().refetch();
+  }
+
+  private async _retry() {
+    const reason = this.recoveryReason.trim();
+    if (!reason || !this.retryRiskAcknowledged) return;
+    const orderId = this.$$renderContext.cellContext.row.id as TableIdentity;
+    const actionIdempotencyKey = this.retryIdempotencyKey ?? crypto.randomUUID();
+    this.retryIdempotencyKey = actionIdempotencyKey;
+    await this.$$modelOrder
+      .retryRefund(orderId)
+      .mutateAsync({ reason, actionIdempotencyKey, acknowledgeRetryRisk: true });
+    this.retryIdempotencyKey = undefined;
+    await this._recovery().refetch();
+  }
+
   protected render() {
     const props = this.$props as ControllerTableCellActionRefundProps;
     const order = this.$$renderContext.cellContext.row
       .original as ApiSchemaCommerceTradeDtoOrderSelectResItem;
     const requested = order.state === 'refund_requested';
+    const recovery = this.recoveryOpen ? this._recovery() : undefined;
+    const recoveryData = recovery?.data as ApiSchemaCommerceTradeDtoRefundRecoveryView | undefined;
+    const showExecute = !recoveryData;
     return (
-      <div class="join">
-        {requested && (
-          <input
-            class="input input-bordered input-sm join-item w-40"
-            name="reason"
-            placeholder={this.scope.locale.RefundDecisionReason()}
-            v-model={this.reason}
-          />
-        )}
-        <label class="label cursor-pointer join-item gap-1 px-2">
-          <input
-            class="checkbox checkbox-sm"
-            name="confirmed"
-            type="checkbox"
-            v-model={this.confirmed}
-          />
-          <span class="label-text text-xs">{this.scope.locale.Confirm()}</span>
-        </label>
-        {requested ? (
-          <>
-            <button class={props.class} type="button" onClick={() => this._approve()}>
-              {this.scope.locale.ApproveRefund()}
-            </button>
-            <button
-              class="btn btn-outline btn-error join-item"
-              type="button"
-              onClick={() => this._reject()}
-            >
-              {this.scope.locale.RejectRefund()}
-            </button>
-          </>
-        ) : (
-          <button class={props.class} type="button" onClick={() => this._execute()}>
-            {this.scope.locale.ExecuteRefund()}
-          </button>
+      <div class="flex flex-col items-start gap-2">
+        <div class="join">
+          {requested && (
+            <input
+              class="input input-bordered input-sm join-item w-40"
+              name="reason"
+              placeholder={this.scope.locale.RefundDecisionReason()}
+              v-model={this.reason}
+            />
+          )}
+          <label class="label cursor-pointer join-item gap-1 px-2">
+            <input
+              class="checkbox checkbox-sm"
+              name="confirmed"
+              type="checkbox"
+              v-model={this.confirmed}
+            />
+            <span class="label-text text-xs">{this.scope.locale.Confirm()}</span>
+          </label>
+          {requested ? (
+            <>
+              <button class={props.class} type="button" onClick={() => this._approve()}>
+                {this.scope.locale.ApproveRefund()}
+              </button>
+              <button
+                class="btn btn-outline btn-error join-item"
+                type="button"
+                onClick={() => this._reject()}
+              >
+                {this.scope.locale.RejectRefund()}
+              </button>
+            </>
+          ) : (
+            <>
+              {showExecute && (
+                <button class={props.class} type="button" onClick={() => this._execute()}>
+                  {this.scope.locale.ExecuteRefund()}
+                </button>
+              )}
+              <button
+                class="btn btn-outline join-item"
+                type="button"
+                onClick={() => this._toggleRecovery()}
+              >
+                {this.scope.locale.InspectRefundRecovery()}
+              </button>
+            </>
+          )}
+        </div>
+        {recoveryData && (
+          <section class="w-full rounded border border-base-300 p-3 text-sm">
+            <p>
+              {this.scope.locale.RefundRecoveryState({
+                state: recoveryData.providerOperationState,
+                attemptCount: recoveryData.attemptCount,
+              })}
+            </p>
+            {recoveryData.providerRefundId && (
+              <p>
+                {this.scope.locale.RefundRecoveryProviderRefundId({
+                  providerRefundId: recoveryData.providerRefundId,
+                })}
+              </p>
+            )}
+            {recoveryData.errorSummary && <p>{recoveryData.errorSummary}</p>}
+            <p class="text-base-content/70">{recoveryData.recoveryMessage}</p>
+            {recoveryData.recoveryDisposition !== 'none' && (
+              <input
+                class="input input-bordered input-sm mt-2 w-full"
+                name="recoveryReason"
+                placeholder={this.scope.locale.RefundRecoveryReason()}
+                v-model={this.recoveryReason}
+              />
+            )}
+            {(recoveryData.recoveryDisposition === 'query_only' ||
+              recoveryData.recoveryDisposition === 'reconcile_only') && (
+              <button
+                class="btn btn-outline btn-sm mt-2"
+                type="button"
+                onClick={() => this._reconcile()}
+              >
+                {this.scope.locale.ReconcileProviderRefund()}
+              </button>
+            )}
+            {recoveryData.recoveryDisposition === 'retry_same_key' && (
+              <>
+                <label class="label cursor-pointer mt-2 justify-start gap-2">
+                  <input
+                    class="checkbox checkbox-sm"
+                    name="retryRiskAcknowledged"
+                    type="checkbox"
+                    v-model={this.retryRiskAcknowledged}
+                  />
+                  <span class="label-text text-xs">
+                    {this.scope.locale.AcknowledgeRefundRetryRisk()}
+                  </span>
+                </label>
+                <button class="btn btn-warning btn-sm" type="button" onClick={() => this._retry()}>
+                  {this.scope.locale.RetryRefund()}
+                </button>
+              </>
+            )}
+          </section>
         )}
       </div>
     );

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/en-us.ts

@@ -14,4 +14,11 @@ export default {
   ApproveRefund: 'Approve refund',
   RejectRefund: 'Reject refund',
   ExecuteRefund: 'Execute refund',
+  InspectRefundRecovery: 'Inspect refund recovery',
+  ReconcileProviderRefund: 'Reconcile provider refund',
+  RetryRefund: 'Retry refund',
+  RefundRecoveryReason: 'Recovery reason',
+  AcknowledgeRefundRetryRisk: 'I understand this retry reuses the original provider request.',
+  RefundRecoveryState: 'Provider operation: {state}; attempts: {attemptCount}',
+  RefundRecoveryProviderRefundId: 'Provider refund ID: {providerRefundId}',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/zh-cn.ts

@@ -14,4 +14,11 @@ export default {
   ApproveRefund: '批准退款',
   RejectRefund: '拒绝退款',
   ExecuteRefund: '执行退款',
+  InspectRefundRecovery: '查看退款恢复',
+  ReconcileProviderRefund: '对账支付服务商退款',
+  RetryRefund: '重试退款',
+  RefundRecoveryReason: '恢复原因',
+  AcknowledgeRefundRetryRisk: '我了解本次重试会复用原支付服务商请求。',
+  RefundRecoveryState: '服务商操作：{state}；尝试次数：{attemptCount}',
+  RefundRecoveryProviderRefundId: '服务商退款 ID：{providerRefundId}',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts

@@ -13,13 +13,13 @@ export interface IModelOptionsCart extends IDecoratorModelOptions {}
 @Model<IModelOptionsCart>()
 export class ModelCart extends BeanModelBase {
   current() {
-    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    if (this.$ssr.cookieDisabledOnServer) return;
+    if (!this.$passport.isAuthenticated) return;
     return this.$useStateData({
       queryKey: ['current'],
       queryFn: async () => {
         return await this.scope.api.commerceTradeCart.current();
       },
-      meta: { disableSuspenseOnInit: true },
     });
   }
 
@@ -66,13 +66,12 @@ export class ModelCart extends BeanModelBase {
   }
 
   paymentMethods() {
-    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    if (!this.$passport.isAuthenticated) return;
     return this.$useStateData({
       queryKey: ['paymentMethods'],
       queryFn: async () => {
         return await this.scope.api.commerceTradeCheckout.paymentMethods();
       },
-      meta: { disableSuspenseOnInit: true },
     });
   }
 

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/order.ts

@@ -7,7 +7,10 @@ import { BeanModelBase, Model } from 'zova-module-a-model';
 
 import type {
   ApiApiCommerceTradeOrderapproveRefundRequestBody,
+  ApiApiCommerceTradeOrderreconcileRefundRequestBody,
+  ApiApiCommerceTradeOrderrefundRecoveryResponseBody,
   ApiApiCommerceTradeOrderrejectRefundRequestBody,
+  ApiApiCommerceTradeOrderretryRefundRequestBody,
   ApiApiCommerceTradeOrdershipRequestBody,
 } from '../api/commerceTradeOrder.js';
 
@@ -75,4 +78,43 @@ export class ModelOrder extends BeanModelBase {
       },
     });
   }
+
+  refundRecovery(id: TableIdentity) {
+    return this.$$modelResource.queryItem<ApiApiCommerceTradeOrderrefundRecoveryResponseBody>({
+      id,
+      action: 'refundRecovery',
+      queryFn: async () => {
+        return await this.scope.api.commerceTradeOrder.refundRecovery({ params: { id } });
+      },
+      meta: {
+        disableSuspenseOnInit: true,
+      },
+    });
+  }
+
+  reconcileRefund(id: TableIdentity) {
+    return this.$$modelResource.mutationItem<
+      unknown,
+      ApiApiCommerceTradeOrderreconcileRefundRequestBody
+    >({
+      id,
+      action: 'reconcileRefund',
+      mutationFn: async payload => {
+        return await this.scope.api.commerceTradeOrder.reconcileRefund(payload, { params: { id } });
+      },
+    });
+  }
+
+  retryRefund(id: TableIdentity) {
+    return this.$$modelResource.mutationItem<
+      unknown,
+      ApiApiCommerceTradeOrderretryRefundRequestBody
+    >({
+      id,
+      action: 'retryRefund',
+      mutationFn: async payload => {
+        return await this.scope.api.commerceTradeOrder.retryRefund(payload, { params: { id } });
+      },
+    });
+  }
 }

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/orderMine.ts

@@ -10,24 +10,22 @@ export interface IModelOptionsOrderMine extends IDecoratorModelOptions {}
 @Model<IModelOptionsOrderMine>()
 export class ModelOrderMine extends BeanModelBase {
   mine(query: { pageNo: number; pageSize: number }) {
-    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    if (!this.$passport.isAuthenticated) return;
     return this.$useStateData({
       queryKey: ['mine', query],
       queryFn: async () => {
         return await this.scope.api.commerceTradeOrder.mine({ query });
       },
-      meta: { disableSuspenseOnInit: true },
     });
   }
 
   viewMine(id: TableIdentity) {
-    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    if (!this.$passport.isAuthenticated) return;
     return this.$useStateData({
       queryKey: ['viewMine', id],
       queryFn: async () => {
         return await this.scope.api.commerceTradeOrder.viewMine({ params: { id } });
       },
-      meta: { disableSuspenseOnInit: true },
     });
   }
 

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/cart/controller.tsx

@@ -2,6 +2,7 @@ import { RouterLink } from '@cabloy/vue-router';
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import { ModelCart } from '../../model/cart.js';
@@ -16,8 +17,11 @@ export class ControllerPageCart extends BeanControllerPageBase {
   @Use()
   $$modelCart: ModelCart;
 
+  protected async __init__() {
+    await $QueryEnsureLoaded(() => this.queryCurrent);
+  }
+
   get queryCurrent() {
-    if (process.env.SERVER) return;
     return this.$$modelCart.current();
   }
 

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/checkout/controller.tsx

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { $QueriesEnsureLoaded } from 'zova-module-a-model';
 import { ModelAddressMine } from 'zova-module-commerce-member';
 import { ModelCoupon } from 'zova-module-commerce-promotion';
 import { ZPage } from 'zova-module-home-base';
@@ -28,13 +29,19 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
   providerCandidateKey?: string;
   submitting = false;
 
+  protected async __init__() {
+    await $QueriesEnsureLoaded(
+      () => this.queryAddresses,
+      () => this.queryCoupons,
+      () => this.queryPaymentMethods,
+    );
+  }
+
   get queryAddresses() {
-    if (!this.$ssr.isRuntimeSsrHydrated) return;
     return this.$$modelAddressMine.mine({ pageNo: 1, pageSize: 100 });
   }
 
   get queryCoupons() {
-    if (!this.$ssr.isRuntimeSsrHydrated) return;
     return this.$$modelCoupon.mine();
   }
 
@@ -66,17 +73,14 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
   }
 
   protected render() {
-    if (!this.$ssr.isRuntimeSsrHydrated) {
-      return (
-        <ZPage>
-          <section class="mx-auto max-w-3xl p-6" aria-busy="true" />
-        </ZPage>
-      );
-    }
     const addresses = this.queryAddresses?.data?.list ?? [];
     const coupons = this.queryCoupons?.data ?? [];
     const paymentMethods = this.queryPaymentMethods?.data;
-    if (!this.providerCandidateKey && paymentMethods?.defaultKey) {
+    if (
+      this.$ssr.isRuntimeSsrHydrated &&
+      !this.providerCandidateKey &&
+      paymentMethods?.defaultKey
+    ) {
       this.providerCandidateKey = paymentMethods.defaultKey;
     }
     return (

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/order/controller.tsx

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import { ModelOrderMine } from '../../model/orderMine.js';
@@ -16,12 +17,15 @@ export class ControllerPageOrder extends BeanControllerPageBase {
   @Use()
   $$modelOrderMine: ModelOrderMine;
 
+  protected async __init__() {
+    await $QueryEnsureLoaded(() => this.queryOrder);
+  }
+
   get orderId() {
     return this.$params.id;
   }
 
   get queryOrder() {
-    if (!this.$ssr.isRuntimeSsrHydrated) return;
     return this.$$modelOrderMine.viewMine(this.orderId);
   }
 
@@ -43,13 +47,6 @@ export class ControllerPageOrder extends BeanControllerPageBase {
   }
 
   protected render() {
-    if (!this.$ssr.isRuntimeSsrHydrated) {
-      return (
-        <ZPage>
-          <section class="mx-auto max-w-4xl p-6" aria-busy="true" />
-        </ZPage>
-      );
-    }
     const query = this.queryOrder;
     const order = query?.data;
     return (

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/orders/controller.tsx

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
 import { ModelOrderMine } from '../../model/orderMine.js';
@@ -18,8 +19,11 @@ export class ControllerPageOrders extends BeanControllerPageBase {
   pageNo = 1;
   readonly pageSize = 10;
 
+  protected async __init__() {
+    await $QueryEnsureLoaded(() => this.queryOrders);
+  }
+
   get queryOrders() {
-    if (!this.$ssr.isRuntimeSsrHydrated) return;
     return this.$$modelOrderMine.mine({ pageNo: this.pageNo, pageSize: this.pageSize });
   }
 
@@ -28,13 +32,6 @@ export class ControllerPageOrders extends BeanControllerPageBase {
   }
 
   protected render() {
-    if (!this.$ssr.isRuntimeSsrHydrated) {
-      return (
-        <ZPage>
-          <section class="mx-auto max-w-4xl p-6" aria-busy="true" />
-        </ZPage>
-      );
-    }
     const query = this.queryOrders;
     const orders = query?.data?.list ?? [];
     const pageCount = query?.data?.pageCount ?? 0;