From 9c3220a2dcf0db776003c8837f2dccab6f06508b Mon Sep 17 00:00:00 2001
From: Xc <chinawraith@163.com>
Date: Thu, 26 Dec 2024 15:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98ship=E8=83=BD=E5=8A=9B=E5=B8=A6?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/Deposit.ts   | 12 ++++++++----
 src/entities/WpProduct.ts |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/entities/Deposit.ts b/src/entities/Deposit.ts
index 7a9824c7..cc2ce54c 100644
--- a/src/entities/Deposit.ts
+++ b/src/entities/Deposit.ts
@@ -21,13 +21,14 @@ export interface Schema extends EntityShape {
     opers: AccountOper[];
 };
 
-export type IAction = 'succeed' | 'fail';
-export type IState = 'depositing' | 'successful' | 'failed';
+export type IAction = 'succeed' | 'fail' | 'ship';
+export type IState = 'depositing' | 'successful' | 'failed' | 'shipped';
 
 export const IActionDef: ActionDef<IAction, IState> = {
     stm: {
-        succeed: ['depositing', 'successful'],
-        fail: ['depositing', 'failed'],
+        ship: ['depositing', 'shipped'],
+        succeed: [['depositing', 'shipped'], 'successful'],
+        fail: [['depositing', 'shipped'], 'failed'],
     },
     is: 'depositing',
 };
@@ -52,11 +53,13 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
                     depositing: '充值中',
                     successful: '充值成功',
                     failed: '充值失败',
+                    shipped: '待用户确认'
                 },
             },
             action: {
                 succeed: '充值成功',
                 fail: '充值失败',
+                ship: '虚拟发货'
             },
         },
     },
@@ -70,6 +73,7 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
                 depositing: '#3498DB',
                 successful: '#52BE80',
                 failed: '#5D6D7E',
+                shipped: '#0000CD',
             },
         },
     },
diff --git a/src/entities/WpProduct.ts b/src/entities/WpProduct.ts
index 941965da..0167498f 100644
--- a/src/entities/WpProduct.ts
+++ b/src/entities/WpProduct.ts
@@ -19,6 +19,7 @@ export interface Schema extends EntityShape {
     taxLossRatio?: Decimal<4, 2>;            // 支付损耗比例，百分数
     application: Application;
     enabled: Boolean;
+    shipping: Boolean;
     pays: Pay[];
 };
 
@@ -35,6 +36,7 @@ export const entityDesc: EntityDesc<Schema, '', '', {
                 application: '关联应用',
                 enabled: '有效中',
                 taxLossRatio: '产品手续费（百分比）',
+                shipping: '受发货限制',
                 pays: '支付',
             },
             v: {