feat:异常订单的修改

.gitignore

@@ -30,3 +30,4 @@ public/admin-assets
 .htaccess
 /owl-admin.code-workspace
 .DS_Store
+.vscode/settings.json

.vscode/settings.json

@@ -83,7 +83,7 @@
         }
     },
     "terminal.integrated.env.linux": {
-        "PATH": "${env:PATH}:${workspaceFolder}/vendor/bin:${workspaceFolder}/script/ansible/bin:${workspaceFolder}/script/bin"
+        "PATH": "/root/.version-fox/temp/1732636800-43351/nodejs/bin:/root/.version-fox/temp/1732636800-43351/python/bin:/root/.version-fox/temp/1732636800-43351/java/bin:/root/.version-fox/temp/1732636800-43351/maven/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:${workspaceFolder}/vendor/bin:${workspaceFolder}/script/ansible/bin:${workspaceFolder}/script/bin"
     },
     "terminal.integrated.defaultProfile.osx": "zsh",
     "terminal.integrated.profiles.osx": {

doc/系统设计/数据库设计/概念模型/新概念.md

@@ -866,6 +866,14 @@ export_on_save:
         - 类型
             - 枚举类型
                 - 优惠卷
+                - 盲盒
+                - 拼团
+                - 砍价
+                - 秒杀
+                - 免费按摩
+                - 朋友代付款
+                - 共享股东
+                - 发红包
         - 开始时间
         - 结束时间
         - 预算金额

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

@@ -77,11 +77,9 @@ FROM
     /* 关联优惠券记录和优惠券表-平台券 */
     LEFT JOIN market_coupon_records mcr_p ON o.id = mcr_p.order_id
     LEFT JOIN market_coupons mc_platform ON mcr_p.coupon_id = mc_platform.id
-    AND mc_platform.coupon_type = 'PLATFORM'
     /* 关联优惠券记录和优惠券表-店铺券 */
     LEFT JOIN market_coupon_records mcr_s ON o.id = mcr_s.order_id
     LEFT JOIN market_coupons mc_shop ON mcr_s.coupon_id = mc_shop.id
-    AND mc_shop.coupon_type = 'SHOP'
     /* 关联订单状态-当前状态 */
     LEFT JOIN order_status os_state ON o.id = os_state.order_id
     AND os_state.rn = 1
@@ -108,3 +106,5 @@ FROM
 WHERE
     o.deleted_at IS NULL
 ORDER BY o.created_at DESC;
+
+select * from;

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

@@ -21,6 +21,7 @@ DROP TABLE IF EXISTS report_order_exception;
 
 CREATE TABLE report_order_exception AS
 /* 异常订单视图 */
+
 DROP VIEW IF EXISTS manage_order_exception;
 
 CREATE OR REPLACE VIEW manage_order_exception AS
@@ -33,15 +34,15 @@ SELECT
     wpr.payment_method /* 支付方式 */,
     orr.state /* 服务状态 */,
     CASE
-        WHEN o.order_source = '1' THEN u_coach.nickname /* 技师昵称 */
-        WHEN o.order_source = '2' THEN sar.shop_name /* 店铺名称 */
+        WHEN o.source = '1' THEN u_coach.nickname /* 技师昵称 */
+        WHEN o.source = '2' THEN sar.shop_name /* 店铺名称 */
         ELSE NULL
     END /* 技师/店铺 */,
     orr.created_at as accept_time /* 技师/店铺接单时间 */,
     o.area_code /* 区域 */,
     o.address /* 地址 */,
     o.remark /* 备注 */,
-    o.order_source /* 订单来源 */
+    o.source /* 订单来源 */
 FROM
     order_exc_records oer
     LEFT JOIN order_records orr ON oer.order_id = orr.order_id /* 关联订单记录表 */