feat:提交文档修改

app/Enums/OrderStatus.php

@@ -57,25 +57,30 @@ enum OrderStatus: int
      */
     case ARRIVED = 10;
 
+    /**
+     * 订单状态：开始服务
+     */
+    case STARTED = 11;
+
     /**
      * 订单状态：服务中
      */
-    case SERVING = 11;
+    case SERVING = 12;
 
     /**
      * 订单状态：服务结束
      */
-    case FINISHED = 12;
+    case FINISHED = 13;
 
     /**
      * 订单状态：撤离
      */
-    case LEFT = 13;
+    case LEFT = 14;
 
     /**
      * 订单状态：已评价
      */
-    case COMMENTED = 14;
+    case COMMENTED = 15;
 
     /**
      * 获取状态的显示文本
@@ -95,10 +100,11 @@ enum OrderStatus: int
             self::ACCEPTED => '接单',
             self::DEPARTED => '出发',
             self::ARRIVED => '到达',
-            self::SERVING => '服务',
-            self::FINISHED => '结束',
+            self::STARTED => '开始服务',
+            self::SERVING => '服务中',
+            self::FINISHED => '服务结束',
             self::LEFT => '撤离',
-            self::COMMENTED => '评价',
+            self::COMMENTED => '已评价',
         };
     }
 

app/Enums/WithdrawAuditStatus.php

@@ -3,7 +3,7 @@
 namespace App\Enums;
 
 /**
- * 提现审核状态枚举类
+ * 钱包提现审核状态枚举类
  */
 enum WithdrawAuditStatus: int
 {
@@ -15,18 +15,13 @@ enum WithdrawAuditStatus: int
     /**
      * 审核状态：审核通过
      */
-    case PASSED = 2;
+    case APPROVED = 2;
 
     /**
      * 审核状态：审核拒绝
      */
     case REJECTED = 3;
 
-    /**
-     * 审核状态：已取消
-     */
-    case CANCELLED = 4;
-
     /**
      * 获取状态的显示文本
      *
@@ -36,9 +31,8 @@ enum WithdrawAuditStatus: int
     {
         return match ($this) {
             self::PENDING => '待审核',
-            self::PASSED => '审核通过',
+            self::APPROVED => '审核通过',
             self::REJECTED => '审核拒绝',
-            self::CANCELLED => '已取消',
         };
     }
 
@@ -73,9 +67,8 @@ enum WithdrawAuditStatus: int
     {
         return match ($value) {
             self::PENDING->value => self::PENDING,
-            self::PASSED->value => self::PASSED,
+            self::APPROVED->value => self::APPROVED,
             self::REJECTED->value => self::REJECTED,
-            self::CANCELLED->value => self::CANCELLED,
             default => null
         };
     }
@@ -99,9 +92,8 @@ enum WithdrawAuditStatus: int
     {
         return [
             self::PENDING->value => self::PENDING->label(),
-            self::PASSED->value => self::PASSED->label(),
+            self::APPROVED->value => self::APPROVED->label(),
             self::REJECTED->value => self::REJECTED->label(),
-            self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
 }

app/Enums/WithdrawStatus.php

@@ -3,29 +3,24 @@
 namespace App\Enums;
 
 /**
- * 提现状态枚举类
+ * 钱包提现状态枚举类
  */
 enum WithdrawStatus: int
 {
     /**
-     * 提现状态：待处理
+     * 提现状态：提现中
      */
-    case PENDING = 1;
-
-    /**
-     * 提现状态：处理中
-     */
-    case PROCESSING = 2;
+    case PROCESSING = 1;
 
     /**
      * 提现状态：提现成功
      */
-    case SUCCESS = 3;
+    case SUCCESS = 2;
 
     /**
      * 提现状态：提现失败
      */
-    case FAILED = 4;
+    case FAILED = 3;
 
     /**
      * 获取状态的显示文本
@@ -35,8 +30,7 @@ enum WithdrawStatus: int
     public function label(): string
     {
         return match ($this) {
-            self::PENDING => '待处理',
-            self::PROCESSING => '处理中',
+            self::PROCESSING => '提现中',
             self::SUCCESS => '提现成功',
             self::FAILED => '提现失败',
         };
@@ -72,7 +66,6 @@ enum WithdrawStatus: int
     public static function fromValue(int $value): ?self
     {
         return match ($value) {
-            self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::SUCCESS->value => self::SUCCESS,
             self::FAILED->value => self::FAILED,
@@ -98,7 +91,6 @@ enum WithdrawStatus: int
     public static function all(): array
     {
         return [
-            self::PENDING->value => self::PENDING->label(),
             self::PROCESSING->value => self::PROCESSING->label(),
             self::SUCCESS->value => self::SUCCESS->label(),
             self::FAILED->value => self::FAILED->label(),

doc/系统设计/数据库设计/物理模型/分析后台设计增加/07代理列表.sql

@@ -12,14 +12,14 @@ WITH
     agent_withdraw AS (
         SELECT w.owner_id, COALESCE(SUM(wr.amount), 0) AS total_withdraw_amount /* 总提现金额 */
         FROM
-            wallet w
-            LEFT JOIN wallet_withdraw_records wr ON w.id = wr.wallet_id
-            AND wr.audit_state = 1
-            AND wr.state = 1
+            wallet w /* 钱包 */
+            LEFT JOIN wallet_withdraw_records wr ON w.id = wr.wallet_id /* 关联钱包提现记录 */
+            AND wr.audit_state = 2 /* 审核通过 */
+            AND wr.state = 2 /* 提现成功 */
         WHERE
-            w.owner_type = 3
+            w.owner_type = 3 /* 代理钱包 */
         GROUP BY
-            w.owner_id
+            w.owner_id /* 代理编号 */
     )
 SELECT
     mu.nickname as agent_nickname /* 代理昵称 */,
@@ -31,13 +31,13 @@ SELECT
     COALESCE(w.total_income, 0) as total_income /* 总收益金额 */,
     COALESCE(w.available_balance, 0) as balance /* 余额 */
 FROM
-    agent_infos ai
-    LEFT JOIN member_users mu ON ai.user_id = mu.id
-    LEFT JOIN wallet w ON w.owner_id = ai.id
-    AND w.owner_type = 3
+    agent_infos ai /* 代理信息 */
+    INNER JOIN member_users mu ON ai.user_id = mu.id /* 关联会员用户 */
+    LEFT JOIN wallet w ON w.owner_id = ai.id /* 关联钱包 */
+    AND w.owner_type = 3 /* 代理钱包 */
+    LEFT JOIN agent_withdraw aw ON aw.owner_id = mu.id /* 关联代理提现 */
 WHERE
-    ai.deleted_at IS NULL
-    AND mu.deleted_at IS NULL
+    ai.deleted_at IS NULL /* 代理信息未删除 */
+    AND mu.deleted_at IS NULL /* 会员用户未删除 */
     AND w.deleted_at IS NULL;
-
-select * from manage_agent_list;
+/* 钱包未删除 */

doc/系统设计/数据库设计/物理模型/分析后台设计增加/08订单管理.sql

@@ -18,7 +18,6 @@
 DROP TABLE IF EXISTS report_order_list;
 
 CREATE TABLE report_order_list AS
-
 /* 订单列表视图 */
 DROP VIEW IF EXISTS manage_order_list;
 
@@ -48,7 +47,7 @@ SELECT
     o.area_code as area_code /* 区域 */,
     o.address as address /* 地址 */,
     o.remark as remark /* 备注 */,
-    o.order_source as order_source /* 订单来源 */,
+    o.source as source /* 订单来源 */,
     os_arrive.created_at as arrive_time /* 到达时间 */,
     TIMESTAMPDIFF(
         MINUTE,
@@ -61,19 +60,19 @@ SELECT
     mc_shop.discount_value as shop_discount /* 商铺代金券 */,
     wpr.payment_method as payment_method /* 支付方式 */,
     o.traffic_amount as traffic_amount /* 路费 */,
-    o.order_type as order_type /* 订单类型 */,
+    o.type as type /* 订单类型 */,
     os_user_leave.created_at as user_leave_time /* 用户确认撤离时间 */,
     os_coach_leave.created_at as coach_leave_time /* 技师确认离开时间 */
 FROM
     `order` o
-    LEFT JOIN project p ON o.service_id = p.id /* 关联项目表 */
+    LEFT JOIN project p ON o.project_id = p.id /* 关联项目表 */
     LEFT JOIN member_users mu ON o.user_id = mu.id /* 关联用户表 */
     /* 关联技师表和用户表获取技师名称 */
     LEFT JOIN coach_users cu ON o.coach_id = cu.id /* 关联技师表 */
     LEFT JOIN member_users coach_mu ON cu.user_id = coach_mu.id /* 关联用户表获取技师名称 */
     LEFT JOIN shop_auth_records sa ON o.shop_id = sa.shop_id /* 关联店铺认证表 */
     LEFT JOIN coach_project cp ON o.coach_id = cp.coach_id
-    AND o.service_id = cp.project_id /* 关联技师项目表 */
+    AND o.project_id = cp.project_id /* 关联技师项目表 */
     LEFT JOIN wallet_payment_records wpr ON o.id = wpr.order_id /* 关联支付记录表 */
     /* 关联优惠券记录和优惠券表-平台券 */
     LEFT JOIN market_coupon_records mcr_p ON o.id = mcr_p.order_id
@@ -88,23 +87,23 @@ FROM
     AND os_state.rn = 1
     /* 关联订单状态-接单时间 */
     LEFT JOIN order_status os_accept ON o.id = os_accept.order_id
-    AND os_accept.state = 'ACCEPTED'
+    AND os_accept.state = 8
     AND os_accept.rn = 1
     /* 关联订单状态-到达时间 */
     LEFT JOIN order_status os_arrive ON o.id = os_arrive.order_id
-    AND os_arrive.state = 'ARRIVED'
+    AND os_arrive.state = 10
     AND os_arrive.rn = 1
     /* 关联订单状态-开始服务时间 */
     LEFT JOIN order_status os_start ON o.id = os_start.order_id
-    AND os_start.state = 'STARTED'
+    AND os_start.state = 11
     AND os_start.rn = 1
     /* 关联订单状态-用户确认撤离时间 */
     LEFT JOIN order_status os_user_leave ON o.id = os_user_leave.order_id
-    AND os_user_leave.state = 'USER_CONFIRMED_LEAVE'
+    AND os_user_leave.state = 14
     AND os_user_leave.rn = 1
     /* 关联订单状态-技师确认离开时间 */
     LEFT JOIN order_status os_coach_leave ON o.id = os_coach_leave.order_id
-    AND os_coach_leave.state = 'COACH_CONFIRMED_LEAVE'
+    AND os_coach_leave.state = 14
     AND os_coach_leave.rn = 1
 WHERE
     o.deleted_at IS NULL